table name changes and changes to support new object hierarchy