Improved class naming scheme