Changes layout names and whitespace