Fix for language object name conflict