Rename Property name for Admin Aggregate and Related changes

Rename Property name for Admin Aggregate and Related changes