diff --git a/.gitmodules b/.gitmodules
index 204b3f308..e04e09cb6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "lib/sol.lib.binmaskflag"]
-	path = lib/sol.lib.binmaskflag
-	url = https://github.com/rainprotocol/sol.lib.binmaskflag
 [submodule "lib/prb-math"]
 	path = lib/prb-math
 	url = https://github.com/PaulRBerg/prb-math
@@ -25,3 +22,6 @@
 [submodule "lib/rain.interpreter.interface"]
 	path = lib/rain.interpreter.interface
 	url = https://github.com/rainlanguage/rain.interpreter.interface
+[submodule "lib/rain.sol.binmaskflag"]
+	path = lib/rain.sol.binmaskflag
+	url = https://github.com/rainlanguage/rain.sol.binmaskflag
diff --git a/lib/rain.sol.binmaskflag b/lib/rain.sol.binmaskflag
new file mode 160000
index 000000000..58b5c1338
--- /dev/null
+++ b/lib/rain.sol.binmaskflag
@@ -0,0 +1 @@
+Subproject commit 58b5c13389c14e6f8238514762c0a6a611fd8280
diff --git a/lib/sol.lib.binmaskflag b/lib/sol.lib.binmaskflag
deleted file mode 160000
index 6ded2e717..000000000
--- a/lib/sol.lib.binmaskflag
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6ded2e7178524b7c5f5c0f9e54ea77a18aa55ea9
diff --git a/src/lib/op/math/LibOpScale18Dynamic.sol b/src/lib/op/math/LibOpScale18Dynamic.sol
index 485ad9af1..8c5bd28bf 100644
--- a/src/lib/op/math/LibOpScale18Dynamic.sol
+++ b/src/lib/op/math/LibOpScale18Dynamic.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.18;
 
 import {LibFixedPointDecimalScale, DECIMAL_MAX_SAFE_INT} from "rain.math.fixedpoint/lib/LibFixedPointDecimalScale.sol";
-import {MASK_2BIT} from "sol.lib.binmaskflag/Binary.sol";
+import {MASK_2BIT} from "rain.sol.binmaskflag/Binary.sol";
 import {Operand} from "rain.interpreter.interface/interface/IInterpreterV3.sol";
 import {Pointer} from "rain.solmem/lib/LibPointer.sol";
 import {IntegrityCheckStateNP} from "../../integrity/LibIntegrityCheckNP.sol";
diff --git a/src/lib/op/math/LibOpScaleNDynamic.sol b/src/lib/op/math/LibOpScaleNDynamic.sol
index 999c5d669..7aca8740a 100644
--- a/src/lib/op/math/LibOpScaleNDynamic.sol
+++ b/src/lib/op/math/LibOpScaleNDynamic.sol
@@ -6,7 +6,7 @@ import {IntegrityCheckStateNP} from "../../integrity/LibIntegrityCheckNP.sol";
 import {InterpreterStateNP} from "../../state/LibInterpreterStateNP.sol";
 import {Pointer} from "rain.solmem/lib/LibPointer.sol";
 import {LibFixedPointDecimalScale, DECIMAL_MAX_SAFE_INT} from "rain.math.fixedpoint/lib/LibFixedPointDecimalScale.sol";
-import {MASK_2BIT} from "sol.lib.binmaskflag/Binary.sol";
+import {MASK_2BIT} from "rain.sol.binmaskflag/Binary.sol";
 import {LibParseLiteral} from "../../parse/literal/LibParseLiteral.sol";
 
 /// @title LibOpScaleNDynamic