Revert "Changed PS_S_NAMES to PS_NAMES."

This reverts commit f97c2e3bf3c5153c8f9f66bc3c2c5a8a98266e6a.