class rename

for more consistent naming scheme