Fixed the reserved layout property and using better names