update: beginning of variable renames for layout