We have a local office domain consisting of Windows 7 and XP machines that is running on Windows Server 2008 R2.

We also have users that connect via VPN into our network.

My concern is that when a remote user opens up a folder, the Network section on the left side of the folder shows the remote user all the computer names in our local network.

I would like to go about renaming our computers in the local network with more descriptive computer names, but I do not want the users off-site to be able to see these computer names by simply opening up a folder. (Granted, they can already do this, but our current naming scheme does not link computer names to users.) I would like to change our computer names so we can determine which computer belongs to which user more easily IF it can be done securely.

How can I ensure that our local computer names are not showing up in the Network folder for remote, VPN-connected users?

My online searches have turned up results where people are advised to turn off Network Sharing and Discovery, but that seems to only ensure that the local machine doesn't see other computer names. I want to prevent OUR computer names from showing up on OTHER computers, and I can't go into the VPN-connected computers and turn off THEIR Network Discovery settings. I would think there is a group policy that would control this but I have not found one yet and I don't know how I would apply it to VPN-connected computers.

Thanks!

EDIT: That's true, a Group Policy wouldn't run on users only connecting via VPN, good point. What about a VPN/router policy, then?