Andy, any update on this?

And be noted that "macmodel" switch does not change info in Terminal.

It says "username-macbook-pro" there. I don't like this.