Hostname in _SMSTSOrgName

Hello there...

Quick question. For the convenience of my deployment folks, I would like to do the following:

_SMSTSOrgName=Acme IT - Deployment on %OSDComputerName%

I have a default OSDComputerName=PC-#Left("%SERIALNUMBER%",12)# but is usually changed by the deployment people to match the username.

Everything works fine except that _SMSTSOrgName=Acme IT - Deployment on %OSDComputerName% shows PC-#Left("%SERIALNUMBER%",12)# instead of the new name input in the wizard. Should I use another variable? I already tried %HostName% but it shows MININT-% which is worse.

Any ideas?

Thanks