changing conflicting names