bipolar affective disorder terminology

Can someone please help? This is driving me nuts. Ocassionally on charts I will see "bipolar affective disorder" or "manic depression." Is this an old term from DSM 3 or something? Or a current one from ICD-10? Does it more closely resemble schizoaffective disorder or is it just bipolar? Does this term just mean "bipolar" with a few extra words thrown in before and after? Or is like here is "bipolar" and "bipolar affective disorder" like how we use bipolar 1 and bipolar 2?
Source: Student Doctor Network - Category: Universities & Medical Training Authors: Tags: Psychology [Psy.D. / Ph.D.] Source Type: forums