Name refactors and Menu Item unit tests