Really fixed the name conflict bug this time