changed conflicting names