renaming to resolve conflict