Fixing class naming