Rename the abstract classes to AbstractXYZ