Revert "Revert "sname changed""

This reverts commit dde18cfbc279dcd969ee02b5f6f7c9201f8cae01.