Build #1217:   Rename subject paths in user-related code to match the nomenclature after the resources... on branch alpha over 9 years ago