Like cbrewer, I wrote a quick script to update the computer name to
match the binding name. I have this setup as a policy.
https://github.com/jonathanchan/Macs-AD/blob/master/hostname_check.py.
It should be trivial to update this if you don't use AD.