Revert "Revert "Changed PS_S_NAMES to PS_NAMES.""

This reverts commit 3e59d4cb3a7a02d17f52b420f0d2f645f796aa67.