fixed conflicting names and other bugs