Yup, it's still the Klingon Empire. The Khitomer Accords and the fallout from the Neranda III incident resulted in a long standing alliance and end of (most)hostilities between the two powers. Culturally, the Klingon Empire would have a hard time joining the Federation, I think, despite the...