Removed Data and Creator from the class names