diff --git a/persistence/nosql/nodes/api/src/main/java/org/apache/polaris/nodeids/api/Node.java b/persistence/nosql/nodes/api/src/main/java/org/apache/polaris/persistence/nosql/nodeids/api/Node.java
similarity index 96%
rename from persistence/nosql/nodes/api/src/main/java/org/apache/polaris/nodeids/api/Node.java
rename to persistence/nosql/nodes/api/src/main/java/org/apache/polaris/persistence/nosql/nodeids/api/Node.java
index 4fb7e82bb7..b543f73c85 100644
--- a/persistence/nosql/nodes/api/src/main/java/org/apache/polaris/nodeids/api/Node.java
+++ b/persistence/nosql/nodes/api/src/main/java/org/apache/polaris/persistence/nosql/nodeids/api/Node.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.polaris.nodeids.api;
+package org.apache.polaris.persistence.nosql.nodeids.api;
 
 import jakarta.annotation.Nullable;
 import java.time.Instant;
diff --git a/persistence/nosql/nodes/api/src/main/java/org/apache/polaris/nodeids/api/NodeLease.java b/persistence/nosql/nodes/api/src/main/java/org/apache/polaris/persistence/nosql/nodeids/api/NodeLease.java
similarity index 96%
rename from persistence/nosql/nodes/api/src/main/java/org/apache/polaris/nodeids/api/NodeLease.java
rename to persistence/nosql/nodes/api/src/main/java/org/apache/polaris/persistence/nosql/nodeids/api/NodeLease.java
index ee88a389fc..0cb1cf0328 100644
--- a/persistence/nosql/nodes/api/src/main/java/org/apache/polaris/nodeids/api/NodeLease.java
+++ b/persistence/nosql/nodes/api/src/main/java/org/apache/polaris/persistence/nosql/nodeids/api/NodeLease.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.polaris.nodeids.api;
+package org.apache.polaris.persistence.nosql.nodeids.api;
 
 import jakarta.annotation.Nullable;
 
diff --git a/persistence/nosql/nodes/api/src/main/java/org/apache/polaris/nodeids/api/NodeManagement.java b/persistence/nosql/nodes/api/src/main/java/org/apache/polaris/persistence/nosql/nodeids/api/NodeManagement.java
similarity index 97%
rename from persistence/nosql/nodes/api/src/main/java/org/apache/polaris/nodeids/api/NodeManagement.java
rename to persistence/nosql/nodes/api/src/main/java/org/apache/polaris/persistence/nosql/nodeids/api/NodeManagement.java
index dd3cf72b66..85773cb71b 100644
--- a/persistence/nosql/nodes/api/src/main/java/org/apache/polaris/nodeids/api/NodeManagement.java
+++ b/persistence/nosql/nodes/api/src/main/java/org/apache/polaris/persistence/nosql/nodeids/api/NodeManagement.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.polaris.nodeids.api;
+package org.apache.polaris.persistence.nosql.nodeids.api;
 
 import jakarta.annotation.Nonnull;
 import jakarta.enterprise.context.ApplicationScoped;
diff --git a/persistence/nosql/nodes/api/src/main/java/org/apache/polaris/nodeids/api/NodeManagementConfig.java b/persistence/nosql/nodes/api/src/main/java/org/apache/polaris/persistence/nosql/nodeids/api/NodeManagementConfig.java
similarity index 98%
rename from persistence/nosql/nodes/api/src/main/java/org/apache/polaris/nodeids/api/NodeManagementConfig.java
rename to persistence/nosql/nodes/api/src/main/java/org/apache/polaris/persistence/nosql/nodeids/api/NodeManagementConfig.java
index c50aa951b7..aa46fd5dd4 100644
--- a/persistence/nosql/nodes/api/src/main/java/org/apache/polaris/nodeids/api/NodeManagementConfig.java
+++ b/persistence/nosql/nodes/api/src/main/java/org/apache/polaris/persistence/nosql/nodeids/api/NodeManagementConfig.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.polaris.nodeids.api;
+package org.apache.polaris.persistence.nosql.nodeids.api;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/persistence/nosql/nodes/impl/src/main/java/org/apache/polaris/nodeids/impl/NodeManagementImpl.java b/persistence/nosql/nodes/impl/src/main/java/org/apache/polaris/persistence/nosql/nodeids/impl/NodeManagementImpl.java
similarity index 96%
rename from persistence/nosql/nodes/impl/src/main/java/org/apache/polaris/nodeids/impl/NodeManagementImpl.java
rename to persistence/nosql/nodes/impl/src/main/java/org/apache/polaris/persistence/nosql/nodeids/impl/NodeManagementImpl.java
index 50ff3653d2..f0e57535ae 100644
--- a/persistence/nosql/nodes/impl/src/main/java/org/apache/polaris/nodeids/impl/NodeManagementImpl.java
+++ b/persistence/nosql/nodes/impl/src/main/java/org/apache/polaris/persistence/nosql/nodeids/impl/NodeManagementImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.polaris.nodeids.impl;
+package org.apache.polaris.persistence.nosql.nodeids.impl;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
@@ -51,18 +51,18 @@
 import org.apache.polaris.ids.api.MonotonicClock;
 import org.apache.polaris.ids.spi.IdGeneratorFactory;
 import org.apache.polaris.ids.spi.IdGeneratorSource;
-import org.apache.polaris.nodeids.api.ImmutableNode;
-import org.apache.polaris.nodeids.api.Node;
-import org.apache.polaris.nodeids.api.NodeLease;
-import org.apache.polaris.nodeids.api.NodeManagement;
-import org.apache.polaris.nodeids.api.NodeManagementConfig;
-import org.apache.polaris.nodeids.spi.ImmutableBuildableNodeManagementState;
-import org.apache.polaris.nodeids.spi.ImmutableNodeState;
-import org.apache.polaris.nodeids.spi.NodeState;
-import org.apache.polaris.nodeids.spi.NodeStore;
-import org.apache.polaris.nodeids.spi.NodeStoreFactory;
 import org.apache.polaris.nosql.async.AsyncExec;
 import org.apache.polaris.nosql.async.Cancelable;
+import org.apache.polaris.persistence.nosql.nodeids.api.ImmutableNode;
+import org.apache.polaris.persistence.nosql.nodeids.api.Node;
+import org.apache.polaris.persistence.nosql.nodeids.api.NodeLease;
+import org.apache.polaris.persistence.nosql.nodeids.api.NodeManagement;
+import org.apache.polaris.persistence.nosql.nodeids.api.NodeManagementConfig;
+import org.apache.polaris.persistence.nosql.nodeids.spi.ImmutableBuildableNodeManagementState;
+import org.apache.polaris.persistence.nosql.nodeids.spi.ImmutableNodeState;
+import org.apache.polaris.persistence.nosql.nodeids.spi.NodeState;
+import org.apache.polaris.persistence.nosql.nodeids.spi.NodeStore;
+import org.apache.polaris.persistence.nosql.nodeids.spi.NodeStoreFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/persistence/nosql/nodes/impl/src/main/java/org/apache/polaris/nodeids/impl/Util.java b/persistence/nosql/nodes/impl/src/main/java/org/apache/polaris/persistence/nosql/nodeids/impl/Util.java
similarity index 90%
rename from persistence/nosql/nodes/impl/src/main/java/org/apache/polaris/nodeids/impl/Util.java
rename to persistence/nosql/nodes/impl/src/main/java/org/apache/polaris/persistence/nosql/nodeids/impl/Util.java
index eaf24887e3..312404b92d 100644
--- a/persistence/nosql/nodes/impl/src/main/java/org/apache/polaris/nodeids/impl/Util.java
+++ b/persistence/nosql/nodes/impl/src/main/java/org/apache/polaris/persistence/nosql/nodeids/impl/Util.java
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.polaris.nodeids.impl;
+package org.apache.polaris.persistence.nosql.nodeids.impl;
 
 import com.google.common.annotations.VisibleForTesting;
 import java.util.Optional;
 import org.apache.polaris.ids.api.IdGeneratorSpec;
 import org.apache.polaris.ids.api.ImmutableBuildableIdGeneratorSpec;
-import org.apache.polaris.nodeids.spi.NodeManagementState;
+import org.apache.polaris.persistence.nosql.nodeids.spi.NodeManagementState;
 
 public final class Util {
   private Util() {}
diff --git a/persistence/nosql/nodes/impl/src/main/java/org/apache/polaris/nodeids/impl/package-info.java b/persistence/nosql/nodes/impl/src/main/java/org/apache/polaris/persistence/nosql/nodeids/impl/package-info.java
similarity index 93%
rename from persistence/nosql/nodes/impl/src/main/java/org/apache/polaris/nodeids/impl/package-info.java
rename to persistence/nosql/nodes/impl/src/main/java/org/apache/polaris/persistence/nosql/nodeids/impl/package-info.java
index 549d09dc56..e753fe59f5 100644
--- a/persistence/nosql/nodes/impl/src/main/java/org/apache/polaris/nodeids/impl/package-info.java
+++ b/persistence/nosql/nodes/impl/src/main/java/org/apache/polaris/persistence/nosql/nodeids/impl/package-info.java
@@ -17,4 +17,4 @@
  * under the License.
  */
 /** Node management implementation, do not directly use the types in this package. */
-package org.apache.polaris.nodeids.impl;
+package org.apache.polaris.persistence.nosql.nodeids.impl;
diff --git a/persistence/nosql/nodes/impl/src/test/java/org/apache/polaris/nodeids/impl/TestNodeLeases.java b/persistence/nosql/nodes/impl/src/test/java/org/apache/polaris/persistence/nosql/nodeids/impl/TestNodeLeases.java
similarity index 96%
rename from persistence/nosql/nodes/impl/src/test/java/org/apache/polaris/nodeids/impl/TestNodeLeases.java
rename to persistence/nosql/nodes/impl/src/test/java/org/apache/polaris/persistence/nosql/nodeids/impl/TestNodeLeases.java
index ae79f8914f..cf9bea73c1 100644
--- a/persistence/nosql/nodes/impl/src/test/java/org/apache/polaris/nodeids/impl/TestNodeLeases.java
+++ b/persistence/nosql/nodes/impl/src/test/java/org/apache/polaris/persistence/nosql/nodeids/impl/TestNodeLeases.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.polaris.nodeids.impl;
+package org.apache.polaris.persistence.nosql.nodeids.impl;
 
 import static java.time.temporal.ChronoUnit.MILLIS;
 import static java.util.Objects.requireNonNull;
-import static org.apache.polaris.nodeids.impl.NodeManagementImpl.RESCHEDULE_AFTER_FAILURE;
+import static org.apache.polaris.persistence.nosql.nodeids.impl.NodeManagementImpl.RESCHEDULE_AFTER_FAILURE;
 import static org.assertj.core.api.InstanceOfAssertFactories.BOOLEAN;
 
 import jakarta.annotation.Nonnull;
@@ -29,9 +29,9 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.apache.polaris.ids.api.IdGeneratorSpec;
 import org.apache.polaris.ids.mocks.MutableMonotonicClock;
-import org.apache.polaris.nodeids.api.NodeManagementConfig;
-import org.apache.polaris.nodeids.spi.NodeState;
 import org.apache.polaris.nosql.async.MockAsyncExec;
+import org.apache.polaris.persistence.nosql.nodeids.api.NodeManagementConfig;
+import org.apache.polaris.persistence.nosql.nodeids.spi.NodeState;
 import org.assertj.core.api.SoftAssertions;
 import org.assertj.core.api.junit.jupiter.InjectSoftAssertions;
 import org.assertj.core.api.junit.jupiter.SoftAssertionsExtension;
diff --git a/persistence/nosql/nodes/impl/src/test/java/org/apache/polaris/nodeids/impl/TestNodeManagementImpl.java b/persistence/nosql/nodes/impl/src/test/java/org/apache/polaris/persistence/nosql/nodeids/impl/TestNodeManagementImpl.java
similarity index 94%
rename from persistence/nosql/nodes/impl/src/test/java/org/apache/polaris/nodeids/impl/TestNodeManagementImpl.java
rename to persistence/nosql/nodes/impl/src/test/java/org/apache/polaris/persistence/nosql/nodeids/impl/TestNodeManagementImpl.java
index 2433d412d0..22b5838fa9 100644
--- a/persistence/nosql/nodes/impl/src/test/java/org/apache/polaris/nodeids/impl/TestNodeManagementImpl.java
+++ b/persistence/nosql/nodes/impl/src/test/java/org/apache/polaris/persistence/nosql/nodeids/impl/TestNodeManagementImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.polaris.nodeids.impl;
+package org.apache.polaris.persistence.nosql.nodeids.impl;
 
 import static java.util.Objects.requireNonNull;
 import static org.assertj.core.api.InstanceOfAssertFactories.type;
@@ -34,14 +34,14 @@
 import org.apache.polaris.ids.api.SnowflakeIdGenerator;
 import org.apache.polaris.ids.impl.MonotonicClockImpl;
 import org.apache.polaris.ids.mocks.MutableMonotonicClock;
-import org.apache.polaris.nodeids.api.NodeLease;
-import org.apache.polaris.nodeids.api.NodeManagementConfig;
-import org.apache.polaris.nodeids.spi.ImmutableBuildableNodeManagementState;
-import org.apache.polaris.nodeids.spi.NodeManagementState;
-import org.apache.polaris.nodeids.spi.NodeStore;
-import org.apache.polaris.nodeids.spi.NodeStoreFactory;
 import org.apache.polaris.nosql.async.AsyncExec;
 import org.apache.polaris.nosql.async.java.JavaPoolAsyncExec;
+import org.apache.polaris.persistence.nosql.nodeids.api.NodeLease;
+import org.apache.polaris.persistence.nosql.nodeids.api.NodeManagementConfig;
+import org.apache.polaris.persistence.nosql.nodeids.spi.ImmutableBuildableNodeManagementState;
+import org.apache.polaris.persistence.nosql.nodeids.spi.NodeManagementState;
+import org.apache.polaris.persistence.nosql.nodeids.spi.NodeStore;
+import org.apache.polaris.persistence.nosql.nodeids.spi.NodeStoreFactory;
 import org.assertj.core.api.SoftAssertions;
 import org.assertj.core.api.junit.jupiter.InjectSoftAssertions;
 import org.assertj.core.api.junit.jupiter.SoftAssertionsExtension;
diff --git a/persistence/nosql/nodes/impl/src/testFixtures/java/org/apache/polaris/nodeids/impl/MockNodeStore.java b/persistence/nosql/nodes/impl/src/testFixtures/java/org/apache/polaris/persistence/nosql/nodeids/impl/MockNodeStore.java
similarity index 91%
rename from persistence/nosql/nodes/impl/src/testFixtures/java/org/apache/polaris/nodeids/impl/MockNodeStore.java
rename to persistence/nosql/nodes/impl/src/testFixtures/java/org/apache/polaris/persistence/nosql/nodeids/impl/MockNodeStore.java
index 912069276e..9fd57dfb0a 100644
--- a/persistence/nosql/nodes/impl/src/testFixtures/java/org/apache/polaris/nodeids/impl/MockNodeStore.java
+++ b/persistence/nosql/nodes/impl/src/testFixtures/java/org/apache/polaris/persistence/nosql/nodeids/impl/MockNodeStore.java
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.polaris.nodeids.impl;
+package org.apache.polaris.persistence.nosql.nodeids.impl;
 
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
-import org.apache.polaris.nodeids.spi.NodeState;
-import org.apache.polaris.nodeids.spi.NodeStore;
+import org.apache.polaris.persistence.nosql.nodeids.spi.NodeState;
+import org.apache.polaris.persistence.nosql.nodeids.spi.NodeStore;
 
 public class MockNodeStore implements NodeStore {
   private final Map<Integer, NodeState> nodeStates = new ConcurrentHashMap<>();
diff --git a/persistence/nosql/nodes/impl/src/testFixtures/java/org/apache/polaris/nodeids/impl/MockNodeStoreFactory.java b/persistence/nosql/nodes/impl/src/testFixtures/java/org/apache/polaris/persistence/nosql/nodeids/impl/MockNodeStoreFactory.java
similarity index 86%
rename from persistence/nosql/nodes/impl/src/testFixtures/java/org/apache/polaris/nodeids/impl/MockNodeStoreFactory.java
rename to persistence/nosql/nodes/impl/src/testFixtures/java/org/apache/polaris/persistence/nosql/nodeids/impl/MockNodeStoreFactory.java
index 48ce350945..eec2ade389 100644
--- a/persistence/nosql/nodes/impl/src/testFixtures/java/org/apache/polaris/nodeids/impl/MockNodeStoreFactory.java
+++ b/persistence/nosql/nodes/impl/src/testFixtures/java/org/apache/polaris/persistence/nosql/nodeids/impl/MockNodeStoreFactory.java
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.polaris.nodeids.impl;
+package org.apache.polaris.persistence.nosql.nodeids.impl;
 
 import jakarta.annotation.Nonnull;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
 import org.apache.polaris.ids.api.IdGenerator;
-import org.apache.polaris.nodeids.spi.NodeManagementState;
-import org.apache.polaris.nodeids.spi.NodeStore;
-import org.apache.polaris.nodeids.spi.NodeStoreFactory;
+import org.apache.polaris.persistence.nosql.nodeids.spi.NodeManagementState;
+import org.apache.polaris.persistence.nosql.nodeids.spi.NodeStore;
+import org.apache.polaris.persistence.nosql.nodeids.spi.NodeStoreFactory;
 
 public class MockNodeStoreFactory implements NodeStoreFactory {
   private final AtomicReference<NodeManagementState> nodeState = new AtomicReference<>();
diff --git a/persistence/nosql/nodes/spi/src/main/java/org/apache/polaris/nodeids/spi/NodeManagementState.java b/persistence/nosql/nodes/spi/src/main/java/org/apache/polaris/persistence/nosql/nodeids/spi/NodeManagementState.java
similarity index 95%
rename from persistence/nosql/nodes/spi/src/main/java/org/apache/polaris/nodeids/spi/NodeManagementState.java
rename to persistence/nosql/nodes/spi/src/main/java/org/apache/polaris/persistence/nosql/nodeids/spi/NodeManagementState.java
index 558b1e1b62..f4e1145ea5 100644
--- a/persistence/nosql/nodes/spi/src/main/java/org/apache/polaris/nodeids/spi/NodeManagementState.java
+++ b/persistence/nosql/nodes/spi/src/main/java/org/apache/polaris/persistence/nosql/nodeids/spi/NodeManagementState.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.polaris.nodeids.spi;
+package org.apache.polaris.persistence.nosql.nodeids.spi;
 
 import java.util.Optional;
 import org.apache.polaris.ids.api.IdGeneratorSpec;
diff --git a/persistence/nosql/nodes/spi/src/main/java/org/apache/polaris/nodeids/spi/NodeState.java b/persistence/nosql/nodes/spi/src/main/java/org/apache/polaris/persistence/nosql/nodeids/spi/NodeState.java
similarity index 94%
rename from persistence/nosql/nodes/spi/src/main/java/org/apache/polaris/nodeids/spi/NodeState.java
rename to persistence/nosql/nodes/spi/src/main/java/org/apache/polaris/persistence/nosql/nodeids/spi/NodeState.java
index a461c39fce..3121ab3d0a 100644
--- a/persistence/nosql/nodes/spi/src/main/java/org/apache/polaris/nodeids/spi/NodeState.java
+++ b/persistence/nosql/nodes/spi/src/main/java/org/apache/polaris/persistence/nosql/nodeids/spi/NodeState.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.polaris.nodeids.spi;
+package org.apache.polaris.persistence.nosql.nodeids.spi;
 
 import java.time.Instant;
 import org.apache.polaris.immutables.PolarisImmutable;
diff --git a/persistence/nosql/nodes/spi/src/main/java/org/apache/polaris/nodeids/spi/NodeStore.java b/persistence/nosql/nodes/spi/src/main/java/org/apache/polaris/persistence/nosql/nodeids/spi/NodeStore.java
similarity index 95%
rename from persistence/nosql/nodes/spi/src/main/java/org/apache/polaris/nodeids/spi/NodeStore.java
rename to persistence/nosql/nodes/spi/src/main/java/org/apache/polaris/persistence/nosql/nodeids/spi/NodeStore.java
index 8950be1b76..9d7f8ae3f7 100644
--- a/persistence/nosql/nodes/spi/src/main/java/org/apache/polaris/nodeids/spi/NodeStore.java
+++ b/persistence/nosql/nodes/spi/src/main/java/org/apache/polaris/persistence/nosql/nodeids/spi/NodeStore.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.polaris.nodeids.spi;
+package org.apache.polaris.persistence.nosql.nodeids.spi;
 
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
diff --git a/persistence/nosql/nodes/spi/src/main/java/org/apache/polaris/nodeids/spi/NodeStoreFactory.java b/persistence/nosql/nodes/spi/src/main/java/org/apache/polaris/persistence/nosql/nodeids/spi/NodeStoreFactory.java
similarity index 95%
rename from persistence/nosql/nodes/spi/src/main/java/org/apache/polaris/nodeids/spi/NodeStoreFactory.java
rename to persistence/nosql/nodes/spi/src/main/java/org/apache/polaris/persistence/nosql/nodeids/spi/NodeStoreFactory.java
index c59db0ed0f..3f9a123f9f 100644
--- a/persistence/nosql/nodes/spi/src/main/java/org/apache/polaris/nodeids/spi/NodeStoreFactory.java
+++ b/persistence/nosql/nodes/spi/src/main/java/org/apache/polaris/persistence/nosql/nodeids/spi/NodeStoreFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.polaris.nodeids.spi;
+package org.apache.polaris.persistence.nosql.nodeids.spi;
 
 import jakarta.annotation.Nonnull;
 import java.util.Optional;