diff --git a/src/compas_timber/ghpython/components/CT_Joint_Options_LButt/code.py b/src/compas_timber/ghpython/components/CT_Joint_Options_LButt/code.py
index 95caa3768..3f9a7fe05 100644
--- a/src/compas_timber/ghpython/components/CT_Joint_Options_LButt/code.py
+++ b/src/compas_timber/ghpython/components/CT_Joint_Options_LButt/code.py
@@ -15,6 +15,6 @@ def RunScript(self, small_beam_butts, modify_cross, reject_i):
         if reject_i is not None:
             args["reject_i"] = reject_i
 
-        options = JointOptions(LButtJoint, ["main_beam", "cross_beam"], **args)
+        options = JointOptions(LButtJoint, ["MainBeam", "CrossBeam"], **args)
 
         return options
diff --git a/src/compas_timber/ghpython/components/CT_Joint_Options_LHalfLap/code.py b/src/compas_timber/ghpython/components/CT_Joint_Options_LHalfLap/code.py
index 80e7c7ab8..8cbd1da89 100644
--- a/src/compas_timber/ghpython/components/CT_Joint_Options_LHalfLap/code.py
+++ b/src/compas_timber/ghpython/components/CT_Joint_Options_LHalfLap/code.py
@@ -13,6 +13,6 @@ def RunScript(self, flip_lap_side, cut_plane_bias):
         if cut_plane_bias:
             args["cut_plane_bias"] = cut_plane_bias
 
-        options = JointOptions(LHalfLapJoint, ["top_beam", "bottom_beam"], **args)
+        options = JointOptions(LHalfLapJoint, ["TopBeam", "BottomBeam"], **args)
 
         return options
diff --git a/src/compas_timber/ghpython/components/CT_Joint_Options_LMiter/code.py b/src/compas_timber/ghpython/components/CT_Joint_Options_LMiter/code.py
index 730807717..4d828c036 100644
--- a/src/compas_timber/ghpython/components/CT_Joint_Options_LMiter/code.py
+++ b/src/compas_timber/ghpython/components/CT_Joint_Options_LMiter/code.py
@@ -10,6 +10,6 @@ def RunScript(self, Cutoff):
         args = {}
         if Cutoff:
             args["cutoff"] = Cutoff
-        options = JointOptions(LMiterJoint, ["first_beam", "second_beam"], **args)
+        options = JointOptions(LMiterJoint, ["FirstBeam", "SecondBeam"], **args)
 
         return options
diff --git a/src/compas_timber/ghpython/components/CT_Joint_Options_NullJoint/code.py b/src/compas_timber/ghpython/components/CT_Joint_Options_NullJoint/code.py
index 400bb7201..de3389eab 100644
--- a/src/compas_timber/ghpython/components/CT_Joint_Options_NullJoint/code.py
+++ b/src/compas_timber/ghpython/components/CT_Joint_Options_NullJoint/code.py
@@ -7,5 +7,5 @@
 
 class NullJointComponent(component):
     def RunScript(self):
-        options = JointOptions(NullJoint, ["first_beam", "second_beam"], **{})
+        options = JointOptions(NullJoint, ["FirstBeam", "SecondBeam"], **{})
         return options
diff --git a/src/compas_timber/ghpython/components/CT_Joint_Options_TButt/code.py b/src/compas_timber/ghpython/components/CT_Joint_Options_TButt/code.py
index 809ea2a20..6e8e6f9a3 100644
--- a/src/compas_timber/ghpython/components/CT_Joint_Options_TButt/code.py
+++ b/src/compas_timber/ghpython/components/CT_Joint_Options_TButt/code.py
@@ -10,6 +10,6 @@ def RunScript(self, Gap):
         args = {}
         if Gap:
             args["gap"] = Gap
-        options = JointOptions(TButtJoint, ["main_beam", "cross_beam"], **args)
+        options = JointOptions(TButtJoint, ["MainBeam", "CrossBeam"], **args)
 
         return options
diff --git a/src/compas_timber/ghpython/components/CT_Joint_Options_THalfLap/code.py b/src/compas_timber/ghpython/components/CT_Joint_Options_THalfLap/code.py
index 73304f243..9178ea241 100644
--- a/src/compas_timber/ghpython/components/CT_Joint_Options_THalfLap/code.py
+++ b/src/compas_timber/ghpython/components/CT_Joint_Options_THalfLap/code.py
@@ -11,6 +11,6 @@ def RunScript(self, flip_lap_side, cut_plane_bias):
             args["flip_lap_side"] = flip_lap_side
         if cut_plane_bias:
             args["cut_plane_bias"] = cut_plane_bias
-        options = JointOptions(THalfLapJoint, ["top_beam", "bottom_beam"], **args)
+        options = JointOptions(THalfLapJoint, ["TopBeam", "BottomBeam"], **args)
 
         return options
diff --git a/src/compas_timber/ghpython/components/CT_Joint_Options_XHalfLap/code.py b/src/compas_timber/ghpython/components/CT_Joint_Options_XHalfLap/code.py
index a9c318857..853541f67 100644
--- a/src/compas_timber/ghpython/components/CT_Joint_Options_XHalfLap/code.py
+++ b/src/compas_timber/ghpython/components/CT_Joint_Options_XHalfLap/code.py
@@ -12,6 +12,6 @@ def RunScript(self, flip_lap_side, cut_plane_bias):
             args["flip_lap_side"] = flip_lap_side
         if cut_plane_bias:
             args["cut_plane_bias"] = cut_plane_bias
-        options = JointOptions(XHalfLapJoint, ["top_beam", "bottom_beam"], **args)
+        options = JointOptions(XHalfLapJoint, ["TopBeam", "BottomBeam"], **args)
 
         return options