Renamed some of the layouts.