diff --git a/core/common/src/main/scala/org/typelevel/otel4s/context/Context.scala b/core/common/src/main/scala/org/typelevel/otel4s/context/Context.scala
index 7c26e424b..929aeb41b 100644
--- a/core/common/src/main/scala/org/typelevel/otel4s/context/Context.scala
+++ b/core/common/src/main/scala/org/typelevel/otel4s/context/Context.scala
@@ -41,7 +41,7 @@ trait Context[C] { outer =>
   /** The root context, from which all other contexts are derived. */
   def root: C
 
-  class Ops(ctx: C) {
+  class ContextOps(ctx: C) {
 
     /** Retrieves the value associated with the given key from the context, if
       * such a value exists.
@@ -70,7 +70,7 @@ object Context {
   def apply[C](implicit c: Context[C]): Context[C] = c
 
   object Implicits {
-    implicit def mkOps[C](ctx: C)(implicit c: Context[C]): c.Ops =
-      new c.Ops(ctx)
+    implicit def mkOps[C](ctx: C)(implicit c: Context[C]): c.ContextOps =
+      new c.ContextOps(ctx)
   }
 }
diff --git a/core/common/src/main/scala/org/typelevel/otel4s/context/vault/VaultContext.scala b/core/common/src/test/scala/org/typelevel/otel4s/context/vault/VaultContext.scala
similarity index 100%
rename from core/common/src/main/scala/org/typelevel/otel4s/context/vault/VaultContext.scala
rename to core/common/src/test/scala/org/typelevel/otel4s/context/vault/VaultContext.scala
diff --git a/java/common/src/main/scala/org/typelevel/otel4s/java/context/package.scala b/java/common/src/main/scala/org/typelevel/otel4s/java/context/package.scala
index 3f85e6b0a..cb96db4b0 100644
--- a/java/common/src/main/scala/org/typelevel/otel4s/java/context/package.scala
+++ b/java/common/src/main/scala/org/typelevel/otel4s/java/context/package.scala
@@ -16,8 +16,10 @@
 
 package org.typelevel.otel4s.java
 
+import cats.mtl.Ask
 import cats.mtl.Local
 
 package object context {
+  type AskContext[F[_]] = Ask[F, Context]
   type LocalContext[F[_]] = Local[F, Context]
 }