Make naming convention for layouts consistent