Yes, CMC taught the Yang style...although he modified it by taking out some of the repititions in the long form. He was a student of Yang Chen Fu who as you know was the grandson of Yang Lu Chan founder of the Yang Style.

Different teacher teach the form with minor differences. So don't worry, you are learning the Yang style, although it really should not matter what style of taiji you are learning. They are all valid styles.