diff --git a/src/flex-lua-expire-output.cpp b/src/flex-lua-expire-output.cpp
index 49d8d876c..00195f1e2 100644
--- a/src/flex-lua-expire-output.cpp
+++ b/src/flex-lua-expire-output.cpp
@@ -97,7 +97,7 @@ int setup_flex_expire_output(lua_State *lua_state,
 /**
  * Define the osm2pgsql.ExpireOutput class/metatable.
  */
-void lua_wrapper_expire_output::init(lua_State *lua_state)
+void lua_wrapper_expire_output_t::init(lua_State *lua_state)
 {
     luaX_set_up_metatable(
         lua_state, "ExpireOutput", OSM2PGSQL_EXPIRE_OUTPUT_CLASS,
@@ -109,7 +109,7 @@ void lua_wrapper_expire_output::init(lua_State *lua_state)
          {"table", lua_trampoline_expire_output_table}});
 }
 
-int lua_wrapper_expire_output::tostring() const
+int lua_wrapper_expire_output_t::tostring() const
 {
     std::string const str =
         fmt::format("osm2pgsql.ExpireOutput[minzoom={},maxzoom={},filename={},"
@@ -121,31 +121,31 @@ int lua_wrapper_expire_output::tostring() const
     return 1;
 }
 
-int lua_wrapper_expire_output::filename() const noexcept
+int lua_wrapper_expire_output_t::filename() const noexcept
 {
     luaX_pushstring(lua_state(), self().filename());
     return 1;
 }
 
-int lua_wrapper_expire_output::maxzoom() const noexcept
+int lua_wrapper_expire_output_t::maxzoom() const noexcept
 {
     lua_pushinteger(lua_state(), self().maxzoom());
     return 1;
 }
 
-int lua_wrapper_expire_output::minzoom() const noexcept
+int lua_wrapper_expire_output_t::minzoom() const noexcept
 {
     lua_pushinteger(lua_state(), self().minzoom());
     return 1;
 }
 
-int lua_wrapper_expire_output::schema() const noexcept
+int lua_wrapper_expire_output_t::schema() const noexcept
 {
     luaX_pushstring(lua_state(), self().schema());
     return 1;
 }
 
-int lua_wrapper_expire_output::table() const noexcept
+int lua_wrapper_expire_output_t::table() const noexcept
 {
     luaX_pushstring(lua_state(), self().table());
     return 1;
diff --git a/src/flex-lua-expire-output.hpp b/src/flex-lua-expire-output.hpp
index dcdc4be4a..9c37f0450 100644
--- a/src/flex-lua-expire-output.hpp
+++ b/src/flex-lua-expire-output.hpp
@@ -25,14 +25,14 @@ int setup_flex_expire_output(lua_State *lua_state,
                              std::string const &default_schema,
                              std::vector<expire_output_t> *expire_outputs);
 
-class lua_wrapper_expire_output : public lua_wrapper_base<expire_output_t>
+class lua_wrapper_expire_output_t : public lua_wrapper_base_t<expire_output_t>
 {
 public:
     static void init(lua_State *lua_state);
 
-    lua_wrapper_expire_output(lua_State *lua_state,
-                              expire_output_t *expire_output)
-    : lua_wrapper_base(lua_state, expire_output)
+    lua_wrapper_expire_output_t(lua_State *lua_state,
+                                expire_output_t *expire_output)
+    : lua_wrapper_base_t(lua_state, expire_output)
     {
     }
 
@@ -43,6 +43,6 @@ class lua_wrapper_expire_output : public lua_wrapper_base<expire_output_t>
     int schema() const noexcept;
     int table() const noexcept;
 
-}; // class lua_wrapper_expire_output
+}; // class lua_wrapper_expire_output_t
 
 #endif // OSM2PGSQL_FLEX_LUA_EXPIRE_OUTPUT_HPP
diff --git a/src/flex-lua-locator.cpp b/src/flex-lua-locator.cpp
index 150457661..8cac5e1ad 100644
--- a/src/flex-lua-locator.cpp
+++ b/src/flex-lua-locator.cpp
@@ -45,7 +45,7 @@ TRAMPOLINE_WRAPPED_OBJECT(locator, first_intersecting)
 
 } // anonymous namespace
 
-connection_params_t lua_wrapper_locator::s_connection_params;
+connection_params_t lua_wrapper_locator_t::s_connection_params;
 
 int setup_flex_locator(lua_State *lua_state, std::vector<locator_t> *locators)
 {
@@ -65,8 +65,8 @@ int setup_flex_locator(lua_State *lua_state, std::vector<locator_t> *locators)
     return 1;
 }
 
-void lua_wrapper_locator::init(lua_State *lua_state,
-                               connection_params_t const &connection_params)
+void lua_wrapper_locator_t::init(lua_State *lua_state,
+                                 connection_params_t const &connection_params)
 {
     s_connection_params = connection_params;
 
@@ -80,7 +80,7 @@ void lua_wrapper_locator::init(lua_State *lua_state,
          {"first_intersecting", lua_trampoline_locator_first_intersecting}});
 }
 
-int lua_wrapper_locator::tostring() const
+int lua_wrapper_locator_t::tostring() const
 {
     std::string const str{fmt::format("osm2pgsql.Locator[name={},size={}]",
                                       self().name(), self().size())};
@@ -88,13 +88,13 @@ int lua_wrapper_locator::tostring() const
     return 1;
 }
 
-int lua_wrapper_locator::name() const noexcept
+int lua_wrapper_locator_t::name() const noexcept
 {
     luaX_pushstring(lua_state(), self().name());
     return 1;
 }
 
-int lua_wrapper_locator::add_bbox()
+int lua_wrapper_locator_t::add_bbox()
 {
     if (lua_gettop(lua_state()) < 5) {
         throw fmt_error("Need locator, name and 4 coordinates as arguments");
@@ -111,7 +111,7 @@ int lua_wrapper_locator::add_bbox()
     return 0;
 }
 
-int lua_wrapper_locator::add_from_db()
+int lua_wrapper_locator_t::add_from_db()
 {
     if (lua_gettop(lua_state()) < 1) {
         throw fmt_error("Need locator and SQL query arguments");
@@ -125,7 +125,7 @@ int lua_wrapper_locator::add_from_db()
     return 0;
 }
 
-int lua_wrapper_locator::all_intersecting()
+int lua_wrapper_locator_t::all_intersecting()
 {
     if (lua_gettop(lua_state()) < 1) {
         throw fmt_error("Need locator and geometry arguments");
@@ -149,7 +149,7 @@ int lua_wrapper_locator::all_intersecting()
     return 1;
 }
 
-int lua_wrapper_locator::first_intersecting()
+int lua_wrapper_locator_t::first_intersecting()
 {
     if (lua_gettop(lua_state()) < 1) {
         throw fmt_error("Need locator and geometry arguments");
diff --git a/src/flex-lua-locator.hpp b/src/flex-lua-locator.hpp
index 186256780..6df0a4ad5 100644
--- a/src/flex-lua-locator.hpp
+++ b/src/flex-lua-locator.hpp
@@ -27,14 +27,14 @@ static char const *const OSM2PGSQL_LOCATOR_CLASS = "osm2pgsql.Locator";
 
 int setup_flex_locator(lua_State *lua_state, std::vector<locator_t> *locators);
 
-class lua_wrapper_locator : public lua_wrapper_base<locator_t>
+class lua_wrapper_locator_t : public lua_wrapper_base_t<locator_t>
 {
 public:
     static void init(lua_State *lua_state,
                      connection_params_t const &connection_params);
 
-    lua_wrapper_locator(lua_State *lua_state, locator_t *locator)
-    : lua_wrapper_base(lua_state, locator)
+    lua_wrapper_locator_t(lua_State *lua_state, locator_t *locator)
+    : lua_wrapper_base_t(lua_state, locator)
     {
     }
 
@@ -48,6 +48,6 @@ class lua_wrapper_locator : public lua_wrapper_base<locator_t>
 private:
     static connection_params_t s_connection_params;
 
-}; // class lua_wrapper_locator
+}; // class lua_wrapper_locator_t
 
 #endif // OSM2PGSQL_FLEX_LUA_LOCATOR_HPP
diff --git a/src/flex-lua-table.cpp b/src/flex-lua-table.cpp
index 72978ecc5..ccf7cf1b4 100644
--- a/src/flex-lua-table.cpp
+++ b/src/flex-lua-table.cpp
@@ -454,7 +454,7 @@ int setup_flex_table(lua_State *lua_state, std::vector<flex_table_t> *tables,
 /**
  * Define the osm2pgsql.Table class/metatable.
  */
-void lua_wrapper_table::init(lua_State *lua_state)
+void lua_wrapper_table_t::init(lua_State *lua_state)
 {
     luaX_set_up_metatable(lua_state, "Table", OSM2PGSQL_TABLE_CLASS,
                           {{"__tostring", lua_trampoline_table_tostring},
@@ -465,7 +465,7 @@ void lua_wrapper_table::init(lua_State *lua_state)
                            {"columns", lua_trampoline_table_columns}});
 }
 
-int lua_wrapper_table::tostring() const
+int lua_wrapper_table_t::tostring() const
 {
     std::string const str{fmt::format("osm2pgsql.Table[{}]", self().name())};
     luaX_pushstring(lua_state(), str);
@@ -473,13 +473,13 @@ int lua_wrapper_table::tostring() const
     return 1;
 }
 
-int lua_wrapper_table::cluster() const noexcept
+int lua_wrapper_table_t::cluster() const noexcept
 {
     lua_pushboolean(lua_state(), self().cluster_by_geom());
     return 1;
 }
 
-int lua_wrapper_table::columns() const
+int lua_wrapper_table_t::columns() const
 {
     lua_createtable(lua_state(), (int)self().num_columns(), 0);
 
@@ -502,13 +502,13 @@ int lua_wrapper_table::columns() const
     return 1;
 }
 
-int lua_wrapper_table::name() const noexcept
+int lua_wrapper_table_t::name() const noexcept
 {
     luaX_pushstring(lua_state(), self().name());
     return 1;
 }
 
-int lua_wrapper_table::schema() const noexcept
+int lua_wrapper_table_t::schema() const noexcept
 {
     luaX_pushstring(lua_state(), self().schema());
     return 1;
diff --git a/src/flex-lua-table.hpp b/src/flex-lua-table.hpp
index 9bda81830..326633318 100644
--- a/src/flex-lua-table.hpp
+++ b/src/flex-lua-table.hpp
@@ -26,13 +26,13 @@ int setup_flex_table(lua_State *lua_state, std::vector<flex_table_t> *tables,
                      std::string const &default_schema, bool updatable,
                      bool append_mode);
 
-class lua_wrapper_table : public lua_wrapper_base<flex_table_t>
+class lua_wrapper_table_t : public lua_wrapper_base_t<flex_table_t>
 {
 public:
     static void init(lua_State *lua_state);
 
-    lua_wrapper_table(lua_State *lua_state, flex_table_t *table)
-    : lua_wrapper_base(lua_state, table)
+    lua_wrapper_table_t(lua_State *lua_state, flex_table_t *table)
+    : lua_wrapper_base_t(lua_state, table)
     {
     }
 
@@ -42,6 +42,6 @@ class lua_wrapper_table : public lua_wrapper_base<flex_table_t>
     int name() const noexcept;
     int schema() const noexcept;
 
-}; // class lua_wrapper_table
+}; // class lua_wrapper_table_t
 
 #endif // OSM2PGSQL_FLEX_LUA_TABLE_HPP
diff --git a/src/flex-lua-wrapper.hpp b/src/flex-lua-wrapper.hpp
index 0b63fd704..92c529484 100644
--- a/src/flex-lua-wrapper.hpp
+++ b/src/flex-lua-wrapper.hpp
@@ -23,7 +23,7 @@
             auto *flex =                                                       \
                 static_cast<output_flex_t *>(luaX_get_context(lua_state));     \
             auto &obj = flex->get_##obj_name##_from_param();                   \
-            return lua_wrapper_##obj_name{lua_state, &obj}.func_name();        \
+            return lua_wrapper_##obj_name##_t{lua_state, &obj}.func_name();    \
         } catch (std::exception const &e) {                                    \
             return luaL_error(lua_state, "Error in '" #func_name "': %s\n",    \
                               e.what());                                       \
@@ -39,10 +39,10 @@ struct lua_State;
  * Helper class for wrapping C++ classes in Lua "classes".
  */
 template <typename WRAPPED>
-class lua_wrapper_base
+class lua_wrapper_base_t
 {
 public:
-    lua_wrapper_base(lua_State *lua_state, WRAPPED *wrapped)
+    lua_wrapper_base_t(lua_State *lua_state, WRAPPED *wrapped)
     : m_lua_state(lua_state), m_self(wrapped)
     {
         assert(lua_state);
@@ -59,6 +59,6 @@ class lua_wrapper_base
     lua_State *m_lua_state;
     WRAPPED *m_self;
 
-}; // class lua_wrapper_base;
+}; // class lua_wrapper_base_t
 
 #endif // OSM2PGSQL_FLEX_LUA_WRAPPER_HPP
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index f29ff5f15..46b70f13f 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -1306,9 +1306,9 @@ void output_flex_t::init_lua(std::string const &filename,
     luaX_add_table_func(lua_state(), "define_expire_output",
                         lua_trampoline_app_define_expire_output);
 
-    lua_wrapper_expire_output::init(lua_state());
-    lua_wrapper_locator::init(lua_state(), get_options()->connection_params);
-    lua_wrapper_table::init(lua_state());
+    lua_wrapper_expire_output_t::init(lua_state());
+    lua_wrapper_locator_t::init(lua_state(), get_options()->connection_params);
+    lua_wrapper_table_t::init(lua_state());
 
     // Clean up stack
     lua_settop(lua_state(), 0);