improved class naming