improve class naming convention