Updating class names
Merge and cleanup