Refractoring layout names