WDS keep existing computer name

Hello,

We have WDS up and running on a recently setup server.  Most of it is all defaults apart from the fact that we have added boot images and system images.  We have an unattend file with the %MACHINENAME% in it, but for some reason it always generates a random name based on the info in the AD DS tab in the WDS server properties:

%61Username%#

Why would a reimaged computer not take the existing name if the unattend file says to do so?

Unattend file is called OOBEunattend.xml located in E:\Answer Files\WdsClientUnattend\

This is the first part that includes the %MACHINENAME% variable.

<?xml version="1.0" encoding="utf-8"?>
<unattend xmlns="urn:schemas-microsoft-com:unattend">
    <settings pass="specialize">
        <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
            <RegisteredOrganization>ORG</RegisteredOrganization>
            <ComputerName>%MACHINENAME%</ComputerName>
            <RegisteredOwner>User</RegisteredOwner>
            <TimeZone>Central Standard Time</TimeZone>
        </component>
        <component name="Microsoft-Windows-UnattendedJoin" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
            <Identification>
                <Credentials>
                    <Domain>domain.ca</Domain>
                    <Password>password</Password>
                    <Username>administrator</Username>
                </Credentials>
                <JoinDomain>domain.ca</JoinDomain>
            </Identification>
        </component>
    </settings>

Must be missing something...

Any help would be great.

Thanks,

Dan.