fix class naming