diff --git a/src/mbgl/map/geometry_tile.hpp b/src/mbgl/map/geometry_tile.hpp
index 18222b622..dc1ef1072 100644
--- a/src/mbgl/map/geometry_tile.hpp
+++ b/src/mbgl/map/geometry_tile.hpp
@@ -33,7 +33,7 @@ public:
 class GeometryTileLayer : private util::noncopyable {
 public:
     virtual std::size_t featureCount() const = 0;
-    virtual util::ptr<const GeometryTileFeature> feature(std::size_t) const = 0;
+    virtual util::ptr<const GeometryTileFeature> getFeature(std::size_t) const = 0;
 };
 
 class GeometryTile : private util::noncopyable {
diff --git a/src/mbgl/map/live_tile.hpp b/src/mbgl/map/live_tile.hpp
index 019c9da74..6a24518d8 100644
--- a/src/mbgl/map/live_tile.hpp
+++ b/src/mbgl/map/live_tile.hpp
@@ -29,7 +29,7 @@ public:
     void addFeature(util::ptr<const LiveTileFeature>);
     void removeFeature(util::ptr<const LiveTileFeature>);
     std::size_t featureCount() const override { return features.size(); }
-    util::ptr<const GeometryTileFeature> feature(std::size_t i) const override { return features[i]; }
+    util::ptr<const GeometryTileFeature> getFeature(std::size_t i) const override { return features[i]; }
 
 private:
     std::vector<util::ptr<const LiveTileFeature>> features;
diff --git a/src/mbgl/map/tile_parser.cpp b/src/mbgl/map/tile_parser.cpp
index 5c91c310e..fa7f4c093 100644
--- a/src/mbgl/map/tile_parser.cpp
+++ b/src/mbgl/map/tile_parser.cpp
@@ -215,7 +215,7 @@ std::unique_ptr<Bucket> TileParser::createBucket(const StyleBucket &bucketDesc)
 template <class Bucket>
 void TileParser::addBucketGeometries(Bucket& bucket, const GeometryTileLayer& layer, const FilterExpression &filter) {
     for (std::size_t i = 0; i < layer.featureCount(); i++) {
-        auto feature = layer.feature(i);
+        auto feature = layer.getFeature(i);
 
         if (obsolete())
             return;
diff --git a/src/mbgl/map/vector_tile.cpp b/src/mbgl/map/vector_tile.cpp
index c0d860b17..dca2168a4 100644
--- a/src/mbgl/map/vector_tile.cpp
+++ b/src/mbgl/map/vector_tile.cpp
@@ -159,7 +159,7 @@ VectorTileLayer::VectorTileLayer(pbf layer_pbf) {
     }
 }
 
-util::ptr<const GeometryTileFeature> VectorTileLayer::feature(std::size_t i) const {
+util::ptr<const GeometryTileFeature> VectorTileLayer::getFeature(std::size_t i) const {
     return std::make_shared<VectorTileFeature>(features.at(i), *this);
 }
 
diff --git a/src/mbgl/map/vector_tile.hpp b/src/mbgl/map/vector_tile.hpp
index f6a2d615b..9a23c3b18 100644
--- a/src/mbgl/map/vector_tile.hpp
+++ b/src/mbgl/map/vector_tile.hpp
@@ -31,7 +31,7 @@ public:
     VectorTileLayer(pbf);
 
     std::size_t featureCount() const override { return features.size(); }
-    util::ptr<const GeometryTileFeature> feature(std::size_t) const override;
+    util::ptr<const GeometryTileFeature> getFeature(std::size_t) const override;
 
 private:
     friend class VectorTile;
diff --git a/src/mbgl/renderer/symbol_bucket.cpp b/src/mbgl/renderer/symbol_bucket.cpp
index 2c28d7219..ad54581e1 100644
--- a/src/mbgl/renderer/symbol_bucket.cpp
+++ b/src/mbgl/renderer/symbol_bucket.cpp
@@ -60,7 +60,7 @@ std::vector<SymbolFeature> SymbolBucket::processFeatures(const GeometryTileLayer
     std::set<GlyphRange> ranges;
 
     for (std::size_t i = 0; i < layer.featureCount(); i++) {
-        auto feature = layer.feature(i);
+        auto feature = layer.getFeature(i);
 
         GeometryTileFeatureExtractor extractor(*feature);
         if (!evaluate(filter, extractor))