Three package:units

Deprecated: The singleton prefix is changing from p to s. The p versions will be removed in a future release.
Deprecated: The singleton prefix is changing from p to s. The p versions will be removed in a future release.