diff --git a/extensions/functions_geometry.yaml b/extensions/functions_geometry.yaml
index 19cf31acc..eab3bfea3 100644
--- a/extensions/functions_geometry.yaml
+++ b/extensions/functions_geometry.yaml
@@ -7,8 +7,8 @@ scalar_functions:
       Return the x coordinate of the point.  Return null if not available.
     impls:
       - args:
-          - value: geometry
-            name: point
+          - name: point
+            value: u!geometry
         return: fp64
   -
     name: "y_coodinate"
@@ -16,8 +16,8 @@ scalar_functions:
       Return the y coordinate of the point.  Return null if not available.
     impls:
       - args:
-          - value: geometry
-            name: point
+          - name: point
+            value: u!geometry
         return: fp64
   -
     name: "numpoints"
@@ -26,8 +26,8 @@ scalar_functions:
       or circularstring.
     impls:
       - args:
-          - value: geometry
-            name: geom
+          - name: geom
+            value: u!geometry
         return: i64
   -
     name: "isempty"
@@ -35,8 +35,8 @@ scalar_functions:
       Return true is the geometry is an ampty geometry.
     impls:
       - args:
-          - value: geometry
-            name: geom
+          - name: geom
+            value: u!geometry
         return: boolean
   -
     name: "isclosed"
@@ -44,8 +44,8 @@ scalar_functions:
       Return true if the geometry's start and end points are the same.
     impls:
       - args:
-          - value: geometry
-            name: geom
+          - name: geom
+            value: geometry
         return: boolean
   -
     name: "issimple"
@@ -53,8 +53,8 @@ scalar_functions:
       Return true if the geometry does not self intersect.
     impls:
       - args:
-          - value: geometry
-            name: geom
+          - name: geom
+            value: u!geometry
         return: boolean
   -
     name: "isring"
@@ -63,8 +63,8 @@ scalar_functions:
       intersect.
     impls:
       - args:
-          - value: geometry
-            name: geom
+          - name: geom
+            value: u!geometry
         return: boolean
   -
     name: "geometrytype"
@@ -72,8 +72,8 @@ scalar_functions:
       Return the type of geometry as a string.
     impls:
       - args:
-          - value: geometry
-            name: geom
+          - name: geom
+            value: u!geometry
         return: string
   -
     name: "envelope"
@@ -84,9 +84,9 @@ scalar_functions:
       input geometry is a point or a line, the returned geometry can also be a point or line.
     impls:
       - args:
-          - value: geometry
-            name: geom
-        return: geometry
+          - name: geom
+            value: u!geometry
+        return: u!geometry
   -
     name: "dimension"
     description: >
@@ -98,6 +98,6 @@ scalar_functions:
       POLYGON - 2
     impls:
       - args:
-          - value: geometry
-            name: geom
+          - name: geom
+            value: u!geometry
         return: i8