Fixed object name conflict