diff --git a/paper-api/src/main/java/io/papermc/paper/registry/set/RegistryKeySet.java b/paper-api/src/main/java/io/papermc/paper/registry/set/RegistryKeySet.java
index c552c19288d5..67c4c1f29481 100644
--- a/paper-api/src/main/java/io/papermc/paper/registry/set/RegistryKeySet.java
+++ b/paper-api/src/main/java/io/papermc/paper/registry/set/RegistryKeySet.java
@@ -25,7 +25,7 @@
  * @param <T> registry value type
  */
 @ApiStatus.NonExtendable
-public non-sealed interface RegistryKeySet<T extends Keyed> extends Iterable<TypedKey<T>>, RegistrySet<T> { // TODO remove Keyed
+public non-sealed interface RegistryKeySet<T extends Keyed> extends Iterable<TypedKey<T>>, RegistrySet<T> { // TODO: Remove Keyed once the registry-based API is finalized
 
     @Override
     default int size() {
diff --git a/paper-api/src/main/java/io/papermc/paper/registry/tag/Tag.java b/paper-api/src/main/java/io/papermc/paper/registry/tag/Tag.java
index 245eb1074ce2..f618b9c7d7c8 100644
--- a/paper-api/src/main/java/io/papermc/paper/registry/tag/Tag.java
+++ b/paper-api/src/main/java/io/papermc/paper/registry/tag/Tag.java
@@ -15,7 +15,7 @@
  */
 @ApiStatus.Experimental
 @NullMarked
-public interface Tag<T extends Keyed> extends RegistryKeySet<T> { // TODO remove Keyed
+public interface Tag<T extends Keyed> extends RegistryKeySet<T> { // TODO: Remove Keyed once the registry-based API is finalized
 
     /**
      * Get the identifier for this named set.
diff --git a/paper-server/src/main/java/io/papermc/paper/registry/entry/RegistryEntry.java b/paper-server/src/main/java/io/papermc/paper/registry/entry/RegistryEntry.java
index 17c7ec77cf1a..d7fc2847a264 100644
--- a/paper-server/src/main/java/io/papermc/paper/registry/entry/RegistryEntry.java
+++ b/paper-server/src/main/java/io/papermc/paper/registry/entry/RegistryEntry.java
@@ -7,7 +7,7 @@
 import net.minecraft.resources.ResourceKey;
 import org.bukkit.Keyed;
 
-public interface RegistryEntry<M, A extends Keyed> { // TODO remove Keyed
+public interface RegistryEntry<M, A extends Keyed> { // TODO: Remove Keyed once the registry-based API is finalized
 
     RegistryHolder<A> createRegistryHolder(Registry<M> nmsRegistry);
 
diff --git a/paper-server/src/main/java/io/papermc/paper/registry/set/PaperRegistrySets.java b/paper-server/src/main/java/io/papermc/paper/registry/set/PaperRegistrySets.java
index e865932d4166..b4ab270a48aa 100644
--- a/paper-server/src/main/java/io/papermc/paper/registry/set/PaperRegistrySets.java
+++ b/paper-server/src/main/java/io/papermc/paper/registry/set/PaperRegistrySets.java
@@ -16,7 +16,7 @@
 
 public final class PaperRegistrySets {
 
-    public static <A extends Keyed, M> HolderSet<M> convertToNms(final ResourceKey<? extends Registry<M>> resourceKey, final RegistryOps.RegistryInfoLookup lookup, final RegistryKeySet<A> registryKeySet) { // TODO remove Keyed
+    public static <A extends Keyed, M> HolderSet<M> convertToNms(final ResourceKey<? extends Registry<M>> resourceKey, final RegistryOps.RegistryInfoLookup lookup, final RegistryKeySet<A> registryKeySet) { // TODO: Remove Keyed once the registry-based API is finalized
         if (registryKeySet instanceof NamedRegistryKeySetImpl<A, ?>) {
             return ((NamedRegistryKeySetImpl<A, M>) registryKeySet).namedSet();
         } else {
@@ -27,7 +27,7 @@ public static <A extends Keyed, M> HolderSet<M> convertToNms(final ResourceKey<?
         }
     }
 
-    public static <A extends Keyed, M> HolderSet<M> convertToNmsWithDirects(final ResourceKey<? extends Registry<M>> resourceKey, final RegistryOps.RegistryInfoLookup lookup, final RegistrySet<A> registrySet) { // TODO remove Keyed
+    public static <A extends Keyed, M> HolderSet<M> convertToNmsWithDirects(final ResourceKey<? extends Registry<M>> resourceKey, final RegistryOps.RegistryInfoLookup lookup, final RegistrySet<A> registrySet) { // TODO: Remove Keyed once the registry-based API is finalized
         if (registrySet instanceof NamedRegistryKeySetImpl<A, ?>) {
             return ((NamedRegistryKeySetImpl<A, M>) registrySet).namedSet();
         } else if (registrySet.isEmpty()) {
@@ -51,7 +51,7 @@ public static <A extends Keyed, M> HolderSet<M> convertToNmsWithDirects(final Re
         }
     }
 
-    public static <A extends Keyed, M> RegistryKeySet<A> convertToApi(final RegistryKey<A> registryKey, final HolderSet<M> holders) { // TODO remove Keyed
+    public static <A extends Keyed, M> RegistryKeySet<A> convertToApi(final RegistryKey<A> registryKey, final HolderSet<M> holders) { // TODO: Remove Keyed once the registry-based API is finalized
         if (holders instanceof final HolderSet.Named<M> named) {
             return new NamedRegistryKeySetImpl<>(PaperRegistries.fromNms(named.key()), named);
         } else {
@@ -66,7 +66,7 @@ public static <A extends Keyed, M> RegistryKeySet<A> convertToApi(final Registry
         }
     }
 
-    public static <A extends Keyed, M> RegistrySet<A> convertToApiWithDirects(final RegistryKey<A> registryKey, final HolderSet<M> holders) { // TODO remove Keyed
+    public static <A extends Keyed, M> RegistrySet<A> convertToApiWithDirects(final RegistryKey<A> registryKey, final HolderSet<M> holders) { // TODO: Remove Keyed once the registry-based API is finalized
         if (holders instanceof final HolderSet.Named<M> named) {
             return new NamedRegistryKeySetImpl<>(PaperRegistries.fromNms(named.key()), named);
         } else {