update naming scheme for classes