* Changed names for Defines/Classes.