diff --git a/orx-fx/src/jvmDemo/kotlin/DemoColorDuotone01.kt b/orx-fx/src/jvmDemo/kotlin/DemoColorDuotone01.kt
index b5a6a7b46..ea365f765 100644
--- a/orx-fx/src/jvmDemo/kotlin/DemoColorDuotone01.kt
+++ b/orx-fx/src/jvmDemo/kotlin/DemoColorDuotone01.kt
@@ -14,7 +14,7 @@ fun main() {
 
             extend {
 
-                duotone.labInterpolation = seconds.mod_(2.0) < 1.0
+                duotone.labInterpolation = seconds.mod(2.0) < 1.0
                 duotone.apply(image, filteredImage)
                 drawer.image(filteredImage)
 
diff --git a/orx-fx/src/jvmDemo/kotlin/DemoDitherLumaHalftone01.kt b/orx-fx/src/jvmDemo/kotlin/DemoDitherLumaHalftone01.kt
index 25f4cfce3..9d488ff1d 100644
--- a/orx-fx/src/jvmDemo/kotlin/DemoDitherLumaHalftone01.kt
+++ b/orx-fx/src/jvmDemo/kotlin/DemoDitherLumaHalftone01.kt
@@ -18,7 +18,7 @@ fun main() {
                 lumaHalftone.phase0 = seconds*0.1
                 lumaHalftone.phase1 = -seconds*0.1
                 lumaHalftone.apply(image, filteredImage)
-                lumaHalftone.invert = seconds.mod_(2.0) < 1.0
+                lumaHalftone.invert = seconds.mod(2.0) < 1.0
                 drawer.image(filteredImage)
             }
         }
diff --git a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoAnimations01.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoAnimations01.kt
index a0350442f..8f5b45039 100644
--- a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoAnimations01.kt
+++ b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoAnimations01.kt
@@ -45,7 +45,7 @@ fun main() = application {
             fov = 40.0
         }
         extend {
-            sceneData.animations[0].applyToTargets(seconds.mod_(sceneData.animations[0].duration))
+            sceneData.animations[0].applyToTargets(seconds.mod(sceneData.animations[0].duration))
             drawer.clear(ColorRGBa.PINK)
             renderer.draw(drawer, scene)
         }
diff --git a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoCamera01.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoCamera01.kt
index 1c7bce0ee..36c3e3a52 100644
--- a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoCamera01.kt
+++ b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoCamera01.kt
@@ -32,7 +32,7 @@ fun main() = application {
         val cameras = scene.root.findContent { this as? PerspectiveCamera }
 
         extend {
-            sceneData.animations[0].applyToTargets(seconds.mod_(sceneData.animations[0].duration))
+            sceneData.animations[0].applyToTargets(seconds.mod(sceneData.animations[0].duration))
             drawer.view = cameras[0].content.viewMatrix
             drawer.projection = cameras[0].content.projectionMatrix
             drawer.clear(ColorRGBa.PINK)
diff --git a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights01.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights01.kt
index 811a79b81..836a99c0d 100644
--- a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights01.kt
+++ b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights01.kt
@@ -35,7 +35,7 @@ fun main() = application {
             camera.setView(Vector3.ZERO, Spherical(30.50, 26.0, 5.6), 40.0)
         }
         extend {
-            sceneData.animations[0].applyToTargets(seconds.mod_(sceneData.animations[0].duration))
+            sceneData.animations[0].applyToTargets(seconds.mod(sceneData.animations[0].duration))
             drawer.clear(ColorRGBa.PINK)
             renderer.draw(drawer, scene)
         }
diff --git a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights02.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights02.kt
index 7e49a65a7..67236c80f 100644
--- a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights02.kt
+++ b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights02.kt
@@ -36,7 +36,7 @@ fun main() = application {
             camera.setView(Vector3(-0.514, -0.936, -1.122), Spherical(454.346, 25.0, 8.444), 40.0)
         }
         extend {
-            sceneData.animations[0].applyToTargets(seconds.mod_(sceneData.animations[0].duration))
+            sceneData.animations[0].applyToTargets(seconds.mod(sceneData.animations[0].duration))
             drawer.clear(ColorRGBa.PINK)
             renderer.draw(drawer, scene)
         }
diff --git a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights03.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights03.kt
index 9818d9560..2c55b2c0d 100644
--- a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights03.kt
+++ b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights03.kt
@@ -35,7 +35,7 @@ fun main() = application {
         }
 
         extend {
-            sceneData.animations[0].applyToTargets(seconds.mod_(sceneData.animations[0].duration))
+            sceneData.animations[0].applyToTargets(seconds.mod(sceneData.animations[0].duration))
             drawer.clear(ColorRGBa.PINK)
             renderer.draw(drawer, scene)
         }
diff --git a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoSegmentContours01.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoSegmentContours01.kt
index 7496737e9..ce42de8c4 100644
--- a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoSegmentContours01.kt
+++ b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoSegmentContours01.kt
@@ -37,7 +37,7 @@ fun main() = application {
         }
 
         extend {
-            sceneData.animations[2].applyToTargets(seconds.mod_(sceneData.animations[2].duration))
+            sceneData.animations[2].applyToTargets(seconds.mod(sceneData.animations[2].duration))
             drawer.clear(ColorRGBa.PINK)
             renderer.draw(drawer, scene)
         }
diff --git a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoSkinning01.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoSkinning01.kt
index 1632bc764..7bfcbfaba 100644
--- a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoSkinning01.kt
+++ b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoSkinning01.kt
@@ -39,7 +39,7 @@ fun main() = application {
         }
 
         extend {
-            sceneData.animations[2].applyToTargets(seconds.mod_(sceneData.animations[2].duration))
+            sceneData.animations[2].applyToTargets(seconds.mod(sceneData.animations[2].duration))
             drawer.clear(ColorRGBa.PINK)
             renderer.draw(drawer, scene)
         }
diff --git a/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/ControlManager.kt b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/ControlManager.kt
index 0c2e95a70..92ece2c21 100644
--- a/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/ControlManager.kt
+++ b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/ControlManager.kt
@@ -136,9 +136,9 @@ class ControlManager : Extension {
 
                         target = if (target != null) {
                             if (KeyModifier.SHIFT in event.modifiers) {
-                                focusableControls[(index - 1).mod_(focusableControls.size)]
+                                focusableControls[(index - 1).mod(focusableControls.size)]
                             } else {
-                                focusableControls[(index + 1).mod_(focusableControls.size)]
+                                focusableControls[(index + 1).mod(focusableControls.size)]
                             }
                         } else {
                             lastTarget ?: focusableControls[0]
diff --git a/orx-noise/src/commonMain/kotlin/Functions.kt b/orx-noise/src/commonMain/kotlin/Functions.kt
index ed72a4155..f7677eb7a 100644
--- a/orx-noise/src/commonMain/kotlin/Functions.kt
+++ b/orx-noise/src/commonMain/kotlin/Functions.kt
@@ -267,7 +267,7 @@ fun ((Int, Double) -> Double).crossFade(
     width: Double = 0.5
 ): (Int, Double) -> Double {
     return { seed, t ->
-        val a = t.map(start, end, 0.0, 1.0).mod_(1.0)
+        val a = t.map(start, end, 0.0, 1.0).mod(1.0)
         val f = (a / width).coerceAtMost(1.0)
         val o = this(seed, a.map(0.0, 1.0, start, end)) * f
         val s = this(seed, (a + 1.0).map(0.0, 1.0, start, end)) * (1.0 - f)
@@ -281,7 +281,7 @@ fun ((Int, Double, Double) -> Double).crossFade(
     width: Double = 0.5
 ): (Int, Double, Double) -> Double {
     return { seed, x, t ->
-        val a = t.map(start, end, 0.0, 1.0).mod_(1.0)
+        val a = t.map(start, end, 0.0, 1.0).mod(1.0)
         val f = (a / width).coerceAtMost(1.0)
         val o = this(seed, x, a.map(0.0, 1.0, start, end)) * f
         val s = this(seed, x, (a + 1.0).map(0.0, 1.0, start, end)) * (1.0 - f)
@@ -295,7 +295,7 @@ fun ((Int, Double, Double, Double) -> Double).crossFade(
     width: Double = 0.5
 ): (Int, Double, Double, Double) -> Double {
     return { seed, x, y, t ->
-        val a = t.map(start, end, 0.0, 1.0).mod_(1.0)
+        val a = t.map(start, end, 0.0, 1.0).mod(1.0)
         val f = (a / width).coerceAtMost(1.0)
         val o = this(seed, x, y, a.map(0.0, 1.0, start, end)) * f
         val s = this(seed, x, y, (a + 1.0).map(0.0, 1.0, start, end)) * (1.0 - f)
diff --git a/orx-noise/src/jvmDemo/kotlin/DemoScatter01.kt b/orx-noise/src/jvmDemo/kotlin/DemoScatter01.kt
index 396f2574e..d1ba0c1b7 100644
--- a/orx-noise/src/jvmDemo/kotlin/DemoScatter01.kt
+++ b/orx-noise/src/jvmDemo/kotlin/DemoScatter01.kt
@@ -19,7 +19,7 @@ fun main() {
                 drawer.fill = ColorRGBa.PINK
                 drawer.circles(points, 4.0)
 
-                if (seconds.mod_(2.0) < 1.0) {
+                if (seconds.mod(2.0) < 1.0) {
                     drawer.stroke = ColorRGBa.PINK
                     drawer.fill = null
                     drawer.shape(shape)
diff --git a/orx-shapes/src/commonMain/kotlin/operators/BulgeContours.kt b/orx-shapes/src/commonMain/kotlin/operators/BulgeContours.kt
index e772e9021..c6ab83d86 100644
--- a/orx-shapes/src/commonMain/kotlin/operators/BulgeContours.kt
+++ b/orx-shapes/src/commonMain/kotlin/operators/BulgeContours.kt
@@ -38,4 +38,4 @@ fun ShapeContour.bulgeSegments(distortion: Double) =
         bulgeSegments { _, _ -> distortion }
 
 fun ShapeContour.bulgeSegments(distortion: List<Double>) =
-        bulgeSegments { index, _ -> distortion[index.mod_(distortion.size)] }
\ No newline at end of file
+        bulgeSegments { index, _ -> distortion[index.mod(distortion.size)] }
\ No newline at end of file
diff --git a/orx-shapes/src/commonMain/kotlin/operators/ChamferCorners.kt b/orx-shapes/src/commonMain/kotlin/operators/ChamferCorners.kt
index 0bae2b212..9d2ef9e77 100644
--- a/orx-shapes/src/commonMain/kotlin/operators/ChamferCorners.kt
+++ b/orx-shapes/src/commonMain/kotlin/operators/ChamferCorners.kt
@@ -163,7 +163,7 @@ fun ShapeContour.arcCorners(lengths: List<Double>,
 
 private class Ring<T>(private val x: List<T>) : List<T> by x {
     override operator fun get(index: Int): T {
-        return x[index.mod_(x.size)]
+        return x[index.mod(x.size)]
     }
 }