fixing class naming