fix method name conflicts, related to #13971