Merge pull request #6059 from fujin/fix-debug-mode-names