Fixes to MBR and added names