Added and refactored Gateway names.  Also updated the
PersonRowDataGateway