Further naming changes and preparatory code for 'menubar' implementation.