class naming convention upgrade