... my point was aiming at greater depths: instead of just fixing the names, enter a layout object and get a fixed copy. I just was  thinking this when looking a the recent layout fixes.