Is this on a cluster? When you say "server property" what are you selecting exactly?

@@servername will give the local machine name, except in a failover cluster, where it will give you the virtual server name

serverproperty('computernamephysicalnetbios') should give you the local machine name. In a failover cluster this is the machine name of the active node