Class Variable Refactoring

Removed references to mc_* in Window Classes.