460671 - Rationalize property names.

POMs cleanup.
6 files changed