Minor changes to window names