some class naming corrections