Fixing name conflict