Layout naming corrected