Keeping same computer name when reimaging

Hello, my apologies if this has already been posted elsewhere but I was not able to find anything on it.

I am working on creating a Windows 10 image job for our environment. We have about 3500 workstations in total. I have been able to capture and deploy a windows 10 enterprise image, however, it always images with a unique name. When we reimage we typically need the computer to retain the same name. For labs/classrooms that have 25+ computers, it would be quite tedious to have to manually rename each computer after reimaging. For windows 7, we were able to use the computername string in the unattend file. I found the following article from microsoft that this is no longer possible in windows 10.

https://docs.microsoft.com/en-us/windows-hardware/customize/desktop/unattend/microsoft-windows-shell-setup-computername

Has anyone else encountered this with windows 10? Any suggestions?

Any feedback would be appreciated.

Thanks,

Dan