renaming classes to avoid conflicts