Fix class name conflict renaming it