Consistent class naming convention