Renaming to more appropriate class names.