UI: Rename a couple layout widgets to remove compile warnings