changed gateway names to endpoint
change query-composer to hub