Add PS prefix to some classes I missed in r201538.