layouts: changed naming scheme for readability