diff --git a/samples/src/main/java/com/mapbox/samples/BasicTilequery.java b/samples/src/main/java/com/mapbox/samples/BasicTilequery.java
index c07fdeafb..6d22fc695 100644
--- a/samples/src/main/java/com/mapbox/samples/BasicTilequery.java
+++ b/samples/src/main/java/com/mapbox/samples/BasicTilequery.java
@@ -15,7 +15,7 @@ public class BasicTilequery {
   public static void main(String[] args) {
     MapboxTilequery tilequery = MapboxTilequery.builder()
       .accessToken(BuildConfig.MAPBOX_ACCESS_TOKEN)
-      .mapIds("mapbox.mapbox-streets-v7")
+      .tilesetIds("mapbox.mapbox-streets-v7")
       .query(Point.fromLngLat(-122.42901, 37.806332))
       .radius(500)
       .limit(2)
diff --git a/services-tilequery/src/main/java/com/mapbox/api/tilequery/MapboxTilequery.java b/services-tilequery/src/main/java/com/mapbox/api/tilequery/MapboxTilequery.java
index fe666b9d7..94cb77bf1 100644
--- a/services-tilequery/src/main/java/com/mapbox/api/tilequery/MapboxTilequery.java
+++ b/services-tilequery/src/main/java/com/mapbox/api/tilequery/MapboxTilequery.java
@@ -52,7 +52,7 @@ protected GsonBuilder getGsonBuilder() {
   @Override
   protected Call<FeatureCollection> initializeCall() {
     return getService().getCall(
-      mapIds(),
+      tilesetIds(),
       query(),
       accessToken(),
       radius(),
@@ -69,7 +69,7 @@ private Call<List<FeatureCollection>> getBatchCall() {
     }
 
     batchCall = getService().getBatchCall(
-      mapIds(),
+      tilesetIds(),
       query(),
       accessToken(),
       radius(),
@@ -145,7 +145,7 @@ public static Builder builder() {
   abstract String accessToken();
 
   @NonNull
-  abstract String mapIds();
+  abstract String tilesetIds();
 
   @NonNull
   abstract String query();
@@ -201,11 +201,11 @@ public abstract static class Builder {
      * The ID of the map being queried. If you need to composite multiple layers, the Tilequery
      * API endpoint can also support a comma-separated list of map IDs.
      *
-     * @param mapIds Map ID(s)
+     * @param tilesetIds tile set ID(s)
      * @return this builder for chaining options together
      * @since 3.5.0
      */
-    public abstract Builder mapIds(String mapIds);
+    public abstract Builder tilesetIds(String tilesetIds);
 
     /**
      * The longitude and latitude to be queried.
diff --git a/services-tilequery/src/main/java/com/mapbox/api/tilequery/TilequeryService.java b/services-tilequery/src/main/java/com/mapbox/api/tilequery/TilequeryService.java
index f510d7c2b..6ede717c0 100644
--- a/services-tilequery/src/main/java/com/mapbox/api/tilequery/TilequeryService.java
+++ b/services-tilequery/src/main/java/com/mapbox/api/tilequery/TilequeryService.java
@@ -19,7 +19,7 @@ public interface TilequeryService {
   /**
    * Constructs the HTTP request for the specified parameters.
    *
-   * @param mapIds Map ID(s)
+   * @param tilesetIds tile set ID(s)
    * @param query query point
    * @param accessToken Mapbox access token
    * @param radius distance in meters to query for features
@@ -30,9 +30,9 @@ public interface TilequeryService {
    * @return A retrofit Call object
    * @since 3.5.0
    */
-  @GET("/v4/{mapIds}/tilequery/{query}.json")
+  @GET("/v4/{tilesetIds}/tilequery/{query}.json")
   Call<FeatureCollection> getCall(
-    @Path("mapIds") String mapIds,
+    @Path("tilesetIds") String tilesetIds,
     @Path("query") String query,
     @Query("access_token") String accessToken,
     @Query("radius") Integer radius,
@@ -44,7 +44,7 @@ Call<FeatureCollection> getCall(
   /**
    * Constructs the HTTP request for the specified parameters.
    *
-   * @param mapIds Map ID(s)
+   * @param tilesetIds tile set ID(s)
    * @param query query point
    * @param accessToken Mapbox access token
    * @param radius distance in meters to query for features
@@ -55,9 +55,9 @@ Call<FeatureCollection> getCall(
    * @return A retrofit Call object
    * @since 3.5.0
    */
-  @GET("/v4/{mapIds}/tilequery/{query}.json")
+  @GET("/v4/{tilesetIds}/tilequery/{query}.json")
   Call<List<FeatureCollection>> getBatchCall(
-    @Path("mapIds") String mapIds,
+    @Path("tilesetIds") String tilesetIds,
     @Path("query") String query,
     @Query("access_token") String accessToken,
     @Query("radius") Integer radius,
diff --git a/services-tilequery/src/test/java/com/mapbox/api/tilequery/MapboxTilequeryTest.java b/services-tilequery/src/test/java/com/mapbox/api/tilequery/MapboxTilequeryTest.java
index 5d7f14009..71281d40e 100644
--- a/services-tilequery/src/test/java/com/mapbox/api/tilequery/MapboxTilequeryTest.java
+++ b/services-tilequery/src/test/java/com/mapbox/api/tilequery/MapboxTilequeryTest.java
@@ -27,7 +27,7 @@ public void sanity() throws ServicesException, IOException {
         MapboxTilequery client = MapboxTilequery.builder()
           .accessToken(ACCESS_TOKEN)
           .query("-122.42901,37.80633")
-          .mapIds("mapbox.mapbox-streets-v7")
+          .tilesetIds("mapbox.mapbox-streets-v7")
           .baseUrl(mockUrl.toString())
           .build();
         Response<FeatureCollection> response = client.executeCall();
@@ -40,7 +40,7 @@ public void query_acceptsPointsCorrectly() throws Exception {
     MapboxTilequery client = MapboxTilequery.builder()
       .accessToken(ACCESS_TOKEN)
       .query(Point.fromLngLat(-122.42901,37.80633))
-      .mapIds("mapbox.mapbox-streets-v7")
+      .tilesetIds("mapbox.mapbox-streets-v7")
       .baseUrl(mockUrl.toString())
       .build();
 
@@ -56,7 +56,7 @@ public void build_noAccessTokenExceptionThrown() throws Exception {
     thrown.expectMessage("Missing required properties: accessToken");
     MapboxTilequery.builder()
       .query("-122.42901,37.80633")
-      .mapIds("mapbox.mapbox-streets-v7")
+      .tilesetIds("mapbox.mapbox-streets-v7")
       .baseUrl(mockUrl.toString())
       .build();
   }
@@ -68,7 +68,7 @@ public void build_invalidAccessTokenExceptionThrown() throws ServicesException {
     MapboxTilequery.builder()
       .accessToken("")
       .query("-122.42901,37.80633")
-      .mapIds("mapbox.mapbox-streets-v7")
+      .tilesetIds("mapbox.mapbox-streets-v7")
       .baseUrl(mockUrl.toString())
       .build();
   }
@@ -79,7 +79,7 @@ public void build_noQueryExceptionThrown() throws Exception {
     thrown.expectMessage("Missing required properties: query");
     MapboxTilequery.builder()
       .accessToken(ACCESS_TOKEN)
-      .mapIds("mapbox.mapbox-streets-v7")
+      .tilesetIds("mapbox.mapbox-streets-v7")
       .baseUrl(mockUrl.toString())
       .build();
   }
@@ -91,7 +91,7 @@ public void build_invalidQueryExceptionThrown() throws ServicesException {
     MapboxTilequery.builder()
       .accessToken(ACCESS_TOKEN)
       .query("")
-      .mapIds("mapbox.mapbox-streets-v7")
+      .tilesetIds("mapbox.mapbox-streets-v7")
       .baseUrl(mockUrl.toString())
       .build();
   }
@@ -99,7 +99,7 @@ public void build_invalidQueryExceptionThrown() throws ServicesException {
   @Test
   public void build_noMapIdExceptionThrown() throws Exception {
     thrown.expect(IllegalStateException.class);
-    thrown.expectMessage("Missing required properties: mapIds");
+    thrown.expectMessage("Missing required properties: tilesetIds");
     MapboxTilequery.builder()
       .accessToken(ACCESS_TOKEN)
       .query("-122.42901,37.80633")
@@ -112,7 +112,7 @@ public void build_optionalParameters() throws Exception {
     MapboxTilequery client = MapboxTilequery.builder()
       .accessToken(ACCESS_TOKEN)
       .query("-122.42901,37.80633")
-      .mapIds("mapbox.mapbox-streets-v7")
+      .tilesetIds("mapbox.mapbox-streets-v7")
       .baseUrl(mockUrl.toString())
       .build();
 
@@ -132,7 +132,7 @@ public void build_limitGetsAddedToListCorrectly() throws Exception {
     MapboxTilequery client = MapboxTilequery.builder()
       .accessToken(ACCESS_TOKEN)
       .query("-122.42901,37.80633")
-      .mapIds("mapbox.mapbox-streets-v7")
+      .tilesetIds("mapbox.mapbox-streets-v7")
       .baseUrl(mockUrl.toString())
       .limit(50)
       .build();
@@ -145,7 +145,7 @@ public void build_radiusGetsAddedToListCorrectly() throws Exception {
     MapboxTilequery client = MapboxTilequery.builder()
       .accessToken(ACCESS_TOKEN)
       .query("-122.42901,37.80633")
-      .mapIds("mapbox.mapbox-streets-v7")
+      .tilesetIds("mapbox.mapbox-streets-v7")
       .baseUrl(mockUrl.toString())
       .radius(200)
       .build();
@@ -158,7 +158,7 @@ public void build_geometryGetsAddedToListCorrectly() throws Exception {
     MapboxTilequery client = MapboxTilequery.builder()
       .accessToken(ACCESS_TOKEN)
       .query("-122.42901,37.80633")
-      .mapIds("mapbox.mapbox-streets-v7")
+      .tilesetIds("mapbox.mapbox-streets-v7")
       .baseUrl(mockUrl.toString())
       .geometry(TilequeryCriteria.TILEQUERY_GEOMETRY_LINESTRING)
       .build();
@@ -172,7 +172,7 @@ public void build_dedupeGetsAddedToListCorrectly() throws Exception {
     MapboxTilequery client = MapboxTilequery.builder()
       .accessToken(ACCESS_TOKEN)
       .query("-122.42901,37.80633")
-      .mapIds("mapbox.mapbox-streets-v7")
+      .tilesetIds("mapbox.mapbox-streets-v7")
       .baseUrl(mockUrl.toString())
       .dedupe(true)
       .build();
@@ -186,7 +186,7 @@ public void build_layersGetAddedToListCorrectly() throws Exception {
     MapboxTilequery client = MapboxTilequery.builder()
       .accessToken(ACCESS_TOKEN)
       .query("-122.42901,37.80633")
-      .mapIds("mapbox.mapbox-streets-v7")
+      .tilesetIds("mapbox.mapbox-streets-v7")
       .baseUrl(mockUrl.toString())
       .layers("poi_label")
       .build();
@@ -199,7 +199,7 @@ public void executeCall_optionalParamLimitHonored() throws Exception {
     MapboxTilequery clientAppParams = MapboxTilequery.builder()
       .accessToken(ACCESS_TOKEN)
       .query("-122.42901,37.80633")
-      .mapIds("mapbox.mapbox-streets-v7")
+      .tilesetIds("mapbox.mapbox-streets-v7")
       .baseUrl(mockUrl.toString())
       .layers("poi_label")
       .geometry("point")