Renaming classes to be better for sharing