Comment out more NamePrefix entries