just renaming classes - kept tests working