Rename classes to avoid class name duplication