Fixed name conflict #4247