Consistent class naming