Ref #6: Refactor layout:in: variable names