Revert "Revert "Revert "sname changed"""

This reverts commit 085f8b236edd553ed99954815d130080b5860426.