Changing the Class Name and documentation