Fix: 2 Regex compilation errors in NameFixer
Fix a few more scrutinizer issues with NameFixer