Fixed possible name conflict