diff --git a/modules/globebrowsing/globebrowsingmodule.cpp b/modules/globebrowsing/globebrowsingmodule.cpp
index 774bb2fb10..b9074cda6b 100644
--- a/modules/globebrowsing/globebrowsingmodule.cpp
+++ b/modules/globebrowsing/globebrowsingmodule.cpp
@@ -716,7 +716,7 @@ scripting::LuaLibrary GlobeBrowsingModule::luaLibrary() const {
         codegen::lua::GetGeoPositionForCamera,
         codegen::lua::LoadWMSCapabilities,
         codegen::lua::RemoveWMSServer,
-        codegen::lua::Capabilities
+        codegen::lua::CapabilitiesWMS
     };
     res.scripts = {
         absPath("${MODULE_GLOBEBROWSING}/scripts/layer_support.lua")
diff --git a/modules/globebrowsing/globebrowsingmodule_lua.inl b/modules/globebrowsing/globebrowsingmodule_lua.inl
index 045e3b8ec9..8c6a6cee94 100644
--- a/modules/globebrowsing/globebrowsingmodule_lua.inl
+++ b/modules/globebrowsing/globebrowsingmodule_lua.inl
@@ -437,7 +437,7 @@ getLocalPositionFromGeo(std::string globeIdentifier, double latitude, double lon
  * can be used in the 'FilePath' argument for a call to the 'addLayer' function to add the
  * value to a globe.
  */
-[[codegen::luawrap]] std::vector<ghoul::Dictionary> capabilities(std::string name) {
+[[codegen::luawrap]] std::vector<ghoul::Dictionary> capabilitiesWMS(std::string name) {
     using namespace openspace;
     using namespace globebrowsing;
 
diff --git a/src/interaction/sessionrecording_lua.inl b/src/interaction/sessionrecording_lua.inl
index 7b8cfbf626..66766e7e22 100644
--- a/src/interaction/sessionrecording_lua.inl
+++ b/src/interaction/sessionrecording_lua.inl
@@ -70,7 +70,9 @@ namespace {
  * value of true is given, then playback will continually loop until it is manually
  * stopped.
  */
-[[codegen::luawrap]] void startPlaybackDefault(std::string file, bool loop = false) {
+[[codegen::luawrap("startPlayback")]] void startPlaybackDefault(std::string file,
+                                                                bool loop = false)
+{
     using namespace openspace;
     
     if (file.empty()) {
diff --git a/src/navigation/navigationhandler_lua.inl b/src/navigation/navigationhandler_lua.inl
index 2a6107a966..05b8dfcd6d 100644
--- a/src/navigation/navigationhandler_lua.inl
+++ b/src/navigation/navigationhandler_lua.inl
@@ -218,8 +218,10 @@ joystickAxis(std::string joystickName, int axis)
  * Finds the input joystick with the given 'name' and sets the deadzone for a particular
  * joystick axis, which means that any input less than this value is completely ignored.
  */
-[[codegen::luawrap]] void setJoystickAxisDeadZone(std::string joystickName, int axis,
-                                                  float deadzone)
+[[codegen::luawrap("setAxisDeadZone")]] void setJoystickAxisDeadZone(
+                                                                 std::string joystickName,
+                                                                                 int axis,
+                                                                           float deadzone)
 {
     using namespace openspace;
     global::navigationHandler->setJoystickAxisDeadzone(joystickName, axis, deadzone);
@@ -228,7 +230,9 @@ joystickAxis(std::string joystickName, int axis)
 /**
  * Returns the deadzone for the desired axis of the provided joystick.
  */
-[[codegen::luawrap]] float joystickAxisDeadzone(std::string joystickName, int axis) {
+[[codegen::luawrap("axisDeadzone")]] float joystickAxisDeadzone(std::string joystickName,
+                                                                int axis)
+{
     float deadzone = openspace::global::navigationHandler->joystickAxisDeadzone(
         joystickName,
         axis
diff --git a/src/scripting/systemcapabilitiesbinding_lua.inl b/src/scripting/systemcapabilitiesbinding_lua.inl
index 44d676cfa5..aa34390ceb 100644
--- a/src/scripting/systemcapabilitiesbinding_lua.inl
+++ b/src/scripting/systemcapabilitiesbinding_lua.inl
@@ -95,7 +95,7 @@ namespace {
 }
 
 // Returns the L2 associativity.
-[[codegen::luawrap]] int l2Associativity() {
+[[codegen::luawrap("L2Associativity")]] int l2Associativity() {
     int assoc = static_cast<int>(CpuCap.L2Associativity());
     return assoc;
 }
diff --git a/src/util/time_lua.inl b/src/util/time_lua.inl
index b19dc1b7f2..99c9a84f03 100644
--- a/src/util/time_lua.inl
+++ b/src/util/time_lua.inl
@@ -273,7 +273,7 @@ namespace {
 /**
  * Returns the current time as an ISO 8601 date string (YYYY-MM-DDTHH:MN:SS).
  */
-[[codegen::luawrap]] std::string currentTimeUTC() {
+[[codegen::luawrap("UTC")]] std::string currentTimeUTC() {
     return std::string(openspace::global::timeManager->time().UTC());
 }
 
diff --git a/support/coding/codegen b/support/coding/codegen
index c6178634f7..b2c8623b81 160000
--- a/support/coding/codegen
+++ b/support/coding/codegen
@@ -1 +1 @@
-Subproject commit c6178634f7e6bcdc62a67af08f315ee384d0227d
+Subproject commit b2c8623b81005283666ee319b3a972dd2b03c7a0