change conflicting names