class name fix-ing

syncing class names with module name