Fixed Names of classes and variables