Revert "Revert "Revert "Changed PS_S_NAMES to PS_NAMES."""

This reverts commit fb83bce732435a3c534d56e0d0dea0199dfc23ad.