Fine ideas both.  I guess we use layout1, layout2 pretty often in the code, and I was of a mind to change it too, but decided to go with the flow.