Updated names in layout.