diff --git a/src/RenderStatistic.cc b/src/RenderStatistic.cc
index 07e3744545..b9da310b62 100644
--- a/src/RenderStatistic.cc
+++ b/src/RenderStatistic.cc
@@ -354,7 +354,7 @@ void StreamVisitor::visit(const PolySet& ps)
     assert(ps.getDimension() == 3);
     nlohmann::json geometryJson;
     geometryJson["dimensions"] = 3;
-    geometryJson["convex"] = ps.is_convex();
+    geometryJson["convex"] = ps.isConvex();
     geometryJson["facets"] = ps.numFacets();
     if (is_enabled(RenderStatistic::BOUNDING_BOX)) {
       geometryJson["bounding_box"] = getBoundingBox3(ps);
diff --git a/src/geometry/PolySet.cc b/src/geometry/PolySet.cc
index cd4e3a6c4f..3361f3ba8d 100644
--- a/src/geometry/PolySet.cc
+++ b/src/geometry/PolySet.cc
@@ -46,7 +46,7 @@
 
  */
 
-PolySet::PolySet(unsigned int dim, boost::tribool convex) : dim(dim), convex(convex)
+PolySet::PolySet(unsigned int dim, boost::tribool convex) : dim_(dim), convex_(convex)
 {
 }
 
@@ -58,7 +58,7 @@ std::string PolySet::dump() const
 {
   std::ostringstream out;
   out << "PolySet:"
-      << "\n dimensions:" << this->dim
+      << "\n dimensions:" << dim_
       << "\n convexity:" << this->convexity
       << "\n num polygons: " << indices.size()
       << "\n polygons data:";
@@ -74,12 +74,12 @@ std::string PolySet::dump() const
 
 BoundingBox PolySet::getBoundingBox() const
 {
-  if (this->bbox.isNull()) {
+  if (bbox_.isNull()) {
     for (const auto& v : vertices) {
-      this->bbox.extend(v);
+      bbox_.extend(v);
     }
   }
-  return this->bbox;
+  return bbox_;
 }
 
 size_t PolySet::memsize() const
@@ -102,12 +102,12 @@ void PolySet::transform(const Transform3d& mat)
     for (auto& p : this->indices) {
       std::reverse(p.begin(), p.end());
   }
-  this->bbox.setNull();
+  bbox_.setNull();
 }
 
-bool PolySet::is_convex() const {
-  if (convex || this->isEmpty()) return true;
-  if (!convex) return false;
+bool PolySet::isConvex() const {
+  if (convex_ || this->isEmpty()) return true;
+  if (!convex_) return false;
   return PolySetUtils::is_approximately_convex(*this);
 }
 
diff --git a/src/geometry/PolySet.h b/src/geometry/PolySet.h
index e614937605..cca728ee38 100644
--- a/src/geometry/PolySet.h
+++ b/src/geometry/PolySet.h
@@ -23,7 +23,7 @@ class PolySet : public Geometry
   size_t memsize() const override;
   BoundingBox getBoundingBox() const override;
   std::string dump() const override;
-  unsigned int getDimension() const override { return this->dim; }
+  unsigned int getDimension() const override { return dim_; }
   bool isEmpty() const override { return indices.empty(); }
   std::unique_ptr<Geometry> copy() const override;
 
@@ -32,14 +32,14 @@ class PolySet : public Geometry
   void transform(const Transform3d& mat) override;
   void resize(const Vector3d& newsize, const Eigen::Matrix<bool, 3, 1>& autosize) override;
 
-  bool is_convex() const;
-  boost::tribool convexValue() const { return this->convex; }
+  bool isConvex() const;
+  boost::tribool convexValue() const { return convex_; }
   bool isTriangular = false;
 
   static std::unique_ptr<PolySet> createEmpty() { return std::make_unique<PolySet>(3); }
 
 private:
-  unsigned int dim;
-  mutable boost::tribool convex;
-  mutable BoundingBox bbox;
+  unsigned int dim_;
+  mutable boost::tribool convex_;
+  mutable BoundingBox bbox_;
 };
diff --git a/src/geometry/boolean_utils.cc b/src/geometry/boolean_utils.cc
index e89624da6c..7e62bb8518 100644
--- a/src/geometry/boolean_utils.cc
+++ b/src/geometry/boolean_utils.cc
@@ -137,7 +137,7 @@ std::shared_ptr<const Geometry> applyMinkowski(const Geometry::Geometries& child
         else if (nef && nef->p3->is_simple()) CGALUtils::convertNefToPolyhedron(*nef->p3, poly);
         else throw 0;
 
-        if ((ps && ps->is_convex()) ||
+        if ((ps && ps->isConvex()) ||
             (!ps && CGALUtils::is_weakly_convex(poly))) {
           PRINTDB("Minkowski: child %d is convex and %s", i % (ps?"PolySet":"Nef"));
           P[i].push_back(poly);
diff --git a/src/geometry/cgal/cgalutils-applyops-hybrid-minkowski.cc b/src/geometry/cgal/cgalutils-applyops-hybrid-minkowski.cc
index c876989ad4..8bdaf45891 100644
--- a/src/geometry/cgal/cgalutils-applyops-hybrid-minkowski.cc
+++ b/src/geometry/cgal/cgalutils-applyops-hybrid-minkowski.cc
@@ -66,7 +66,7 @@ std::shared_ptr<const Geometry> applyMinkowskiHybrid(const Geometry::Geometries&
           else throw 0;
         } else throw 0;
 
-        if ((ps && ps->is_convex()) ||
+        if ((ps && ps->isConvex()) ||
             (!ps && CGALUtils::is_weakly_convex(*poly))) {
           PRINTDB("Minkowski: child %d is convex and %s", i % (ps?"PolySet":"Hybrid"));
           P[i].push_back(poly);
diff --git a/src/geometry/cgal/cgalutils-hybrid.cc b/src/geometry/cgal/cgalutils-hybrid.cc
index 0f592ecf20..1503dd8a9c 100644
--- a/src/geometry/cgal/cgalutils-hybrid.cc
+++ b/src/geometry/cgal/cgalutils-hybrid.cc
@@ -49,7 +49,7 @@ std::shared_ptr<CGALHybridPolyhedron> createHybridPolyhedronFromPolySet(const Po
   std::vector<Vector3d> points3d;
   psq.quantizeVertices(&points3d);
   auto ps_tri = PolySetUtils::tessellate_faces(psq);
-  if (ps_tri->is_convex()) {
+  if (ps_tri->isConvex()) {
     using K = CGAL::Epick;
     // Collect point cloud
     std::vector<K::Point_3> points(points3d.size());
@@ -70,7 +70,7 @@ std::shared_ptr<CGALHybridPolyhedron> createHybridPolyhedronFromPolySet(const Po
   if (createMeshFromPolySet(*ps_tri, *mesh)) {
     assert(false && "Error from createMeshFromPolySet");
   }
-  if (!ps_tri->is_convex()) {
+  if (!ps_tri->isConvex()) {
     if (isClosed(*mesh)) {
       // Note: PMP::orient can corrupt models and cause cataclysmic memory leaks
       // (try testdata/scad/3D/issues/issue1105d.scad for instance), but
diff --git a/src/geometry/cgal/cgalutils.cc b/src/geometry/cgal/cgalutils.cc
index 6a704b4846..1264a163b1 100644
--- a/src/geometry/cgal/cgalutils.cc
+++ b/src/geometry/cgal/cgalutils.cc
@@ -46,7 +46,7 @@ std::unique_ptr<CGAL_Nef_polyhedron> createNefPolyhedronFromPolySet(const PolySe
   std::vector<Vector3d> points3d;
   psq.quantizeVertices(&points3d);
   auto ps_tri = PolySetUtils::tessellate_faces(psq);
-  if (ps_tri->is_convex()) {
+  if (ps_tri->isConvex()) {
     using K = CGAL::Epick;
     // Collect point cloud
     std::vector<K::Point_3> points(points3d.size());
diff --git a/src/geometry/manifold/manifold-applyops-minkowski.cc b/src/geometry/manifold/manifold-applyops-minkowski.cc
index 8970511fcd..0c5d61e88c 100644
--- a/src/geometry/manifold/manifold-applyops-minkowski.cc
+++ b/src/geometry/manifold/manifold-applyops-minkowski.cc
@@ -31,7 +31,7 @@ std::shared_ptr<const Geometry> applyMinkowskiManifold(const Geometry::Geometrie
     if (ps) {
       auto poly = std::make_shared<Polyhedron>();
       CGALUtils::createPolyhedronFromPolySet(*ps, *poly);
-      if (pIsConvexOut) *pIsConvexOut = ps->is_convex();
+      if (pIsConvexOut) *pIsConvexOut = ps->isConvex();
       return poly;
     } else {
       if (auto mani = std::dynamic_pointer_cast<const ManifoldGeometry>(geom)) {
diff --git a/src/geometry/manifold/manifoldutils.cc b/src/geometry/manifold/manifoldutils.cc
index 9b2ed4809b..dcb8370205 100644
--- a/src/geometry/manifold/manifoldutils.cc
+++ b/src/geometry/manifold/manifoldutils.cc
@@ -116,7 +116,7 @@ std::shared_ptr<const ManifoldGeometry> createManifoldFromPolySet(const PolySet&
   
   CGAL_DoubleMesh m;
 
-  if (ps_tri->is_convex()) {
+  if (ps_tri->isConvex()) {
     using K = CGAL::Epick;
     // Collect point cloud
     std::vector<K::Point_3> points(points3d.size());
@@ -133,7 +133,7 @@ std::shared_ptr<const ManifoldGeometry> createManifoldFromPolySet(const PolySet&
     CGALUtils::createMeshFromPolySet(*ps_tri, m);
   }
 
-  if (!ps_tri->is_convex()) {
+  if (!ps_tri->isConvex()) {
     if (CGALUtils::isClosed(m)) {
       CGALUtils::orientToBoundAVolume(m);
     } else {