Removed the word layout from names