Updated naming convention from site to layout