Rename variables to the new Layout terminology, to ease
future maintenance/understanding of the code.

Change-Id: I619f62a0280238fafefe261fae3f00eb575bb699
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>