fixed conflicting names