back out all of Pat's changes. Too many were made without proper testing.
Its easier to just nuke them all, and do proper testing as I make them.

This reverts commit 5cffaaaa2cc4c37e9b3b1b204bf1b3b52a469161.
Revert "update copyright comment"

This reverts commit bdbad86ed7b362a2fed5462e45cb50b7ec026870.
Revert "rename from setMachineName() to setName()"

This reverts commit dfdd5cf8ba157265648b17addd6bd0e2063cb357.