Changed name of classes