Server gives message: The security database on the server does not have a computer account for this workstation trust relationship

I upgraded 25 laptops from xp Pro to 7 Pro (installed on one and imaged the rest using new SID and unique names) All were able to log on to the domain as administrator but as normal users tried logging on to domain they got the message

"The security database on the server does not have a computer account
for this workstation trust relationship"

so I tried removing them from the domain and joining them again and even removed the computers from Active Directory but still got same message so then I tried this only changing the servicePrincipleName to

HOST\server01 and 
HOST\server01.smc.local

and I got the first three of the laptops logging on to the domain.
The next day I came back to do the rest but when I tried logging on to the virtual server (Server 2008 R2) I got the message

"The security database on the server does not have a computer account
for this workstation trust relationship on the server."

After checking a bit I found this
which suggests to me that the changes I made to the attributes for the 3 laptops in Active Directory caused this problem.
So I'm now wondering if I remove the 3 laptops from the domain, rename them and rejoin the domain will this fix my problem?