SQOOP-1497: Sqoop2: Entity Nomenclature Revisited