More changes towards a layout approach.
Name changes.