diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc
index 21a09cf..0680fda 100644
--- a/CONTRIBUTING.adoc
+++ b/CONTRIBUTING.adoc
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2018 Contributors to the Eclipse Foundation
+// Copyright (c) 2018,2019 Contributors to the Eclipse Foundation
 //
 // See the NOTICE file(s) distributed with this work for additional
 // information regarding copyright ownership.
@@ -24,8 +24,8 @@ Do you want to contribute to this project? Here is what you can do:
 * Fork the repository, make changes, then do a pull request.
 ** Remember to https://help.github.com/articles/signing-commits/[sign your commits]
 ** Make sure you have signed the https://www.eclipse.org/legal/ECA.php[Eclipse Contributor Agreement]
-* https://github.com/eclipse/microprofile-concurrency/issues[Create or fix an issue].
-* https://gitter.im/eclipse/microprofile-concurrency[Join us on Gitter to discuss this project].
+* https://github.com/eclipse/microprofile-context-propagation/issues[Create or fix an issue].
+* https://gitter.im/eclipse/microprofile-context-propagation[Join us on Gitter to discuss this project].
 * Join our https://calendar.google.com/calendar/embed?src=gbnbc373ga40n0tvbl88nkc3r4%40group.calendar.google.com[weekly meeting] on Thursdays at https://www.timeanddate.com/time/map/[14h30 GMT]. 
 ** https://docs.google.com/document/d/1WWyBjtGxZAwIKHvM6wjjY8nQ_x9Cc7WnvMosGuwodG4/edit[Minutes and Agenda].
 ** https://eclipse.zoom.us/j/949859967[Meeting room].
diff --git a/README.adoc b/README.adoc
index c1b0698..2f4da4a 100644
--- a/README.adoc
+++ b/README.adoc
@@ -18,8 +18,8 @@
 //
 image:https://badges.gitter.im/eclipse/microprofile-concurrency.svg[link="https://gitter.im/eclipse/microprofile-concurrency"]
 
-[[microprofile-concurrency]]
-MicroProfile Concurrency
+[[microprofile-context-propagation]]
+MicroProfile Context Propagation
 ------------------------
 :toc:
 
@@ -169,7 +169,7 @@ The thread context provider SPI is defined to bridge the gap,
 allowing any provider of thread context to publish and make
 available the type of thread context it supports, following a
 standard and predictable pattern that can be relied upon by a
-MicroProfile Concurrency implementation, enabling it to
+MicroProfile Context Propagation implementation, enabling it to
 facilitate the inclusion of any generic thread context alongside
 the spec defined thread context types that it captures and
 propagates.
diff --git a/api/pom.xml b/api/pom.xml
index 244154a..1fda67e 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -18,17 +18,17 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.eclipse.microprofile.concurrency</groupId>
-        <artifactId>microprofile-concurrency-parent</artifactId>
+        <groupId>org.eclipse.microprofile.context-propagation</groupId>
+        <artifactId>microprofile-context-propagation-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>microprofile-concurrency-api</artifactId>
+    <artifactId>microprofile-context-propagation-api</artifactId>
     <packaging>jar</packaging>
     <version>1.0-SNAPSHOT</version>
 
-    <name>MicroProfile Concurrency</name>
-    <description>MicroProfile Concurrency :: API</description>
+    <name>MicroProfile Context Propagation</name>
+    <description>MicroProfile Context Propagation :: API</description>
 
     <dependencies>
         <dependency>
diff --git a/pom.xml b/pom.xml
index b49de26..8e4093c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,13 +17,13 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.eclipse.microprofile.concurrency</groupId>
-    <artifactId>microprofile-concurrency-parent</artifactId>
+    <groupId>org.eclipse.microprofile.context-propagation</groupId>
+    <artifactId>microprofile-context-propagation-parent</artifactId>
     <packaging>pom</packaging>
     <version>1.0-SNAPSHOT</version>
 
-    <name>MicroProfile Concurrency</name>
-    <description>Eclipse MicroProfile Concurrency :: Parent POM</description>
+    <name>MicroProfile Context Propagation</name>
+    <description>Eclipse MicroProfile Context Propagation :: Parent POM</description>
 
     <url>http://microprofile.io</url>
 
@@ -56,13 +56,13 @@
 
     <issueManagement>
         <system>GitHub</system>
-        <url>https://github.com/eclipse/microprofile-concurrency/issues</url>
+        <url>https://github.com/eclipse/microprofile-context-propagation/issues</url>
     </issueManagement>
 
     <scm>
-        <connection>scm:git:https://github.com/eclipse/microprofile-concurrency.git</connection>
-        <developerConnection>scm:git:git@github.com:eclipse/microprofile-concurrency.git</developerConnection>
-        <url>https://github.com/eclipse/microprofile-concurrency</url>
+        <connection>scm:git:https://github.com/eclipse/microprofile-context-propagation.git</connection>
+        <developerConnection>scm:git:git@github.com:eclipse/microprofile-context-propagation.git</developerConnection>
+        <url>https://github.com/eclipse/microprofile-context-propagation</url>
         <tag>HEAD</tag>
     </scm>
 
diff --git a/spec/pom.xml b/spec/pom.xml
index 9de6dd7..63de031 100644
--- a/spec/pom.xml
+++ b/spec/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2018 Contributors to the Eclipse Foundation
+  ~ Copyright (c) 2018,2019 Contributors to the Eclipse Foundation
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -21,16 +21,16 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.eclipse.microprofile.concurrency</groupId>
-        <artifactId>microprofile-concurrency-parent</artifactId>
+        <groupId>org.eclipse.microprofile.context-propagation</groupId>
+        <artifactId>microprofile-context-propagation-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>microprofile-concurrency-spec</artifactId>
+    <artifactId>microprofile-context-propagation-spec</artifactId>
     <packaging>pom</packaging>
 
-    <name>MicroProfile Concurrency Specification</name>
-    <description>MicroProfile Concurrency :: Specification</description>
+    <name>MicroProfile Context Propagation Specification</name>
+    <description>MicroProfile Context Propagation :: Specification</description>
 
     <properties>
         <asciidoctor-maven.version>1.5.5</asciidoctor-maven.version>
@@ -88,7 +88,7 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <sourceDocumentName>microprofile-concurrency.asciidoc</sourceDocumentName>
+                    <sourceDocumentName>microprofile-context-propagation.asciidoc</sourceDocumentName>
                     <sourceHighlighter>coderay</sourceHighlighter>
                     <attributes>
                         <license>Apache License v2.0</license>
diff --git a/spec/src/main/asciidoc/builders.asciidoc b/spec/src/main/asciidoc/builders.asciidoc
index 36619a0..e0e77fa 100644
--- a/spec/src/main/asciidoc/builders.asciidoc
+++ b/spec/src/main/asciidoc/builders.asciidoc
@@ -17,7 +17,7 @@
 [[builders]]
 == Builders for ManagedExecutor and ThreadContext
 
-MicroProfile Concurrency provides a fluent builder API to programmatically obtain instances of `ManagedExecutor` and `ThreadContext`. Builder instances are obtained via static `builder()` methods on `ManagedExecutor` and `ThreadContext`.
+The MicroProfile Context Propagation spec defines a fluent builder API to programmatically obtain instances of `ManagedExecutor` and `ThreadContext`. Builder instances are obtained via static `builder()` methods on `ManagedExecutor` and `ThreadContext`.
 
 === Example ManagedExecutor Builder Usage
 
@@ -29,8 +29,8 @@ import javax.servlet.ServletConfig;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.eclipse.microprofile.concurrent.ManagedExecutor;
-import org.eclipse.microprofile.concurrent.ThreadContext;
+import org.eclipse.microprofile.context.ManagedExecutor;
+import org.eclipse.microprofile.context.ThreadContext;
 
 public class ExampleServlet extends HttpServlet {
     ManagedExecutor executor;
@@ -71,7 +71,7 @@ import javax.servlet.ServletConfig;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.eclipse.microprofile.concurrent.ThreadContext;
+import org.eclipse.microprofile.context.ThreadContext;
 
 public class ExampleServlet extends HttpServlet {
     ThreadContext threadContext;
@@ -93,7 +93,7 @@ public class ExampleServlet extends HttpServlet {
         // By using java.util.concurrent.CompletableFuture.supplyAsync rather
         // than a managed executor, context propagation is unpredictable,
         // except for the contextFn action that we pre-contextualized using
-        // MicroProfile Concurrency's ThreadContext above.
+        // ThreadContext above.
         stage = CompletableFuture.supplyAsync(supplier)
                                  .thenApplyAsync(function1)
                                  .thenApply(contextFn)
diff --git a/spec/src/main/asciidoc/cdi.asciidoc b/spec/src/main/asciidoc/cdi.asciidoc
index caf71c9..64a47e8 100644
--- a/spec/src/main/asciidoc/cdi.asciidoc
+++ b/spec/src/main/asciidoc/cdi.asciidoc
@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 
-[[concurrencycdi]]
+[[mpcontextcdi]]
 == CDI Injection
 
 In order to use `ManagedExecutor` and `ThreadContext` as CDI beans, define producer for them as `@ApplicationScoped` so that instances are shared and reused. In most cases, more granular and shorter-lived scopes are undesirable. For instance, having a new `ManagedExecutor` instance created per HTTP request typically does not make sense. In the event that a more granular scope is desired, the application must take care to supply a disposer to ensure that the executor is shut down once it is no longer needed. When using application scope, it is optional to supply a disposer because the specification requires the container to automatically shut down `ManagedExecutor` instances when the application stops.
@@ -39,8 +39,8 @@ public @interface SecurityAndCDIContext {}
 Example producer and disposer,
 [source, java]
 ----
-import org.eclipse.microprofile.concurrent.ManagedExecutor;
-import org.eclipse.microprofile.concurrent.ThreadContext;
+import org.eclipse.microprofile.context.ManagedExecutor;
+import org.eclipse.microprofile.context.ThreadContext;
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.Produces;
 
@@ -60,7 +60,7 @@ public class MyFirstBean {
 Example injection point,
 [source, java]
 ----
-import org.eclipse.microprofile.concurrent.ManagedExecutor;
+import org.eclipse.microprofile.context.ManagedExecutor;
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 
@@ -93,7 +93,7 @@ Example producer method,
 
 [source, java]
 ----
-import org.eclipse.microprofile.concurrent.ThreadContext;
+import org.eclipse.microprofile.context.ThreadContext;
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.Produces;
 
@@ -113,7 +113,7 @@ public class MyFirstBean {
 Example injection point,
 [source, java]
 ----
-import org.eclipse.microprofile.concurrent.ThreadContext;
+import org.eclipse.microprofile.context.ThreadContext;
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 ...
diff --git a/spec/src/main/asciidoc/concurrencyprovider.asciidoc b/spec/src/main/asciidoc/concurrencyprovider.asciidoc
deleted file mode 100644
index 3af20fd..0000000
--- a/spec/src/main/asciidoc/concurrencyprovider.asciidoc
+++ /dev/null
@@ -1,54 +0,0 @@
-//
-// Copyright (c) 2018 Contributors to the Eclipse Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-[[concurrencyprovider]]
-== Concurrency Provider
-
-A MicroProfile Concurrency implementation provides an implementation of the `org.eclipse.microprofile.concurrent.spi.ConcurrencyProvider` interface via either of the following mechanisms:
-
-- By manually registering the implementation via the static `register(ConcurrencyProvider)` method. This register returns a `ConcurrencyProviderRegistration` instance which can be used to unregister.
-
-- Alternately, via the `ServiceLoader`, by including a file of the following name and location:
-  `META-INF/services/org.eclipse.microprofile.concurrent.spi.ConcurrencyProvider`.
-  The content of the aforementioned file must a single line specifying the fully qualified name of the `ConcurrencyProvider` implementation that is provided within the JAR file.
-
-The `ConcurrencyProvider` implementation has one main purpose, which is to supply and maintain instances of `ConcurrencyManager` per class loader. This is done via the `getConcurrencyManager(ClassLoader)` method.
-
-In the case where the `ConcurrencyProvider` is fully integrated with the container, all other methods of `ConcurrencyProvider` are optional, with their default implementations being sufficient.
-
-In the case where the `ConcurrencyProvider` implementation is distinct from the container, several other methods are made available to allow the container to build new instances of `ConcurrencyManager` (via `getConcurrencyManagerBuilder`), register these instances with the `ConcurrencyProvider` per class loader (`registerConcurrencyManager`), and unregister these instances when the class loader is no longer valid (`releaseConcurrencyManager`).
-
-=== Concurrency Manager
-
-`ConcurrencyManager`'s purpose is to provide builders for `ManagedExecutor` and `ThreadContext`. The builders create instances of `ManagedExecutor` and `ThreadContext` where thread context management is based on the `ThreadContextProvider`'s that are accessible to the `ServiceLoader` from the class loader that is associated with the `ConcurrencyManager` instance.
-
-=== Concurrency Manager Builder
-
-The builder for `ConcurrencyManager` is optional if the `ConcurrencyProvider` is inseparable from the container, in which case there is no need to provide an implementation.
-
-This builder enables the container to create customized instances of `ConcurrencyManager` for a particular class loader. The container can choose to have thread context providers loaded from the class loader (`addDiscoveredThreadContextProviders`) or manually supply its own (`withThreadContextProviders`). Similarly, the container can choose to have extensions loaded from the class loader (`addDiscoveredConcurrencyManagerExtensions`) or provide its own (`withConcurrencyManagerExtensions`). The container is responsible for managing registration and unregistration of all `ConcurrencyManager` instances that it builds.
-
-=== Concurrency Manager Extension
-
-`ConcurrencyManagerExtension` is an optional plugin point that allows you to receive notification upon creation of each `ConcurrencyManager`. This serves as a convenient invocation point for enabling system wide context propagator hooks. After creating each `ConcurrencyManager`, the MicroProfile Concurrency implementation queries the `ServiceLoader` for implementations of `org.eclipse.microprofile.concurrent.spi.ConcurrencyManagerExtension` and invokes the setup method of each.
-
-To register a `ConcurrencyManagerExtension`, a JAR file that is accessible from the class loader associated with the `ConcurrencyManager` must include a file of the following name and location,
-
-----
-META-INF/services/org.eclipse.microprofile.concurrent.spi.ConcurrencyManagerExtension
-----
-
-The content of the aforementioned file must be one or more lines, each specifying the fully qualified name of a `ConcurrencyManagerExtension` implementation that is provided within the JAR file.
diff --git a/spec/src/main/asciidoc/contextmanagerprovider.asciidoc b/spec/src/main/asciidoc/contextmanagerprovider.asciidoc
new file mode 100644
index 0000000..1e330f4
--- /dev/null
+++ b/spec/src/main/asciidoc/contextmanagerprovider.asciidoc
@@ -0,0 +1,54 @@
+//
+// Copyright (c) 2018,2019 Contributors to the Eclipse Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+[[contextmanagerprovider]]
+== Context Manager Provider
+
+A MicroProfile Context Propagation implementation provides an implementation of the `org.eclipse.microprofile.context.spi.ContextManagerProvider` interface via either of the following mechanisms:
+
+- By manually registering the implementation via the static `register(ContextManagerProvider)` method. This register returns a `ContextManagerProviderRegistration` instance which can be used to unregister.
+
+- Alternately, via the `ServiceLoader`, by including a file of the following name and location:
+  `META-INF/services/org.eclipse.microprofile.context.spi.ContextManagerProvider`.
+  The content of the aforementioned file must a single line specifying the fully qualified name of the `ContextManagerProvider` implementation that is provided within the JAR file.
+
+The `ContextManagerProvider` implementation has one main purpose, which is to supply and maintain instances of `ContextManager` per class loader. This is done via the `getContextManager(ClassLoader)` method.
+
+In the case where the `ContextManagerProvider` is fully integrated with the container, all other methods of `ContextManagerProvider` are optional, with their default implementations being sufficient.
+
+In the case where the `ContextManagerProvider` implementation is distinct from the container, several other methods are made available to allow the container to build new instances of `ContextManager` (via `getContextManagerBuilder`), register these instances with the `ContextManagerProvider` per class loader (`registerContextManager`), and unregister these instances when the class loader is no longer valid (`releaseContextManager`).
+
+=== Context Manager
+
+`ContextManager`'s purpose is to provide builders for `ManagedExecutor` and `ThreadContext`. The builders create instances of `ManagedExecutor` and `ThreadContext` where thread context management is based on the `ThreadContextProvider`'s that are accessible to the `ServiceLoader` from the class loader that is associated with the `ContextManager` instance.
+
+=== Context Manager Builder
+
+The builder for `ContextManager` is optional if the `ContextManagerProvider` is inseparable from the container, in which case there is no need to provide an implementation.
+
+This builder enables the container to create customized instances of `ContextManager` for a particular class loader. The container can choose to have thread context providers loaded from the class loader (`addDiscoveredThreadContextProviders`) or manually supply its own (`withThreadContextProviders`). Similarly, the container can choose to have extensions loaded from the class loader (`addDiscoveredContextManagerExtensions`) or provide its own (`withContextManagerExtensions`). The container is responsible for managing registration and unregistration of all `ContextManager` instances that it builds.
+
+=== Context Manager Extension
+
+`ContextManagerExtension` is an optional plugin point that allows you to receive notification upon creation of each `ContextManager`. This serves as a convenient invocation point for enabling system wide context propagator hooks. After creating each `ContextManager`, the MicroProfile Context Propagation implementation queries the `ServiceLoader` for implementations of `org.eclipse.microprofile.context.spi.ContextManagerExtension` and invokes the setup method of each.
+
+To register a `ContextManagerExtension`, a JAR file that is accessible from the class loader associated with the `ContextManager` must include a file of the following name and location,
+
+----
+META-INF/services/org.eclipse.microprofile.context.spi.ContextManagerExtension
+----
+
+The content of the aforementioned file must be one or more lines, each specifying the fully qualified name of a `ContextManagerExtension` implementation that is provided within the JAR file.
diff --git a/spec/src/main/asciidoc/contextproviders.asciidoc b/spec/src/main/asciidoc/contextproviders.asciidoc
index 1388954..b9b223d 100644
--- a/spec/src/main/asciidoc/contextproviders.asciidoc
+++ b/spec/src/main/asciidoc/contextproviders.asciidoc
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2018 Contributors to the Eclipse Foundation
+// Copyright (c) 2018,2019 Contributors to the Eclipse Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,9 +19,9 @@
 
 The initial release of EE Concurrency assumed a single monolithic implementation of the full set of EE specifications that could thus rely on vendor-specific internals to achieve context propagation. However, in practice, open source implementations of various specs are often pieced together into a comprehensive solution.
 
-The thread context provider SPI is defined to bridge the gap, allowing any provider of thread context to publish and make available the type of thread context it supports, following a standard and predictable pattern that can be relied upon by a MicroProfile Concurrency implementation, enabling it to facilitate the inclusion of any generic thread context alongside the spec-defined thread context types that it captures and propagates.
+The thread context provider SPI is defined to bridge the gap, allowing any provider of thread context to publish and make available the type of thread context it supports, following a standard and predictable pattern that can be relied upon by a MicroProfile Context Propagation implementation, enabling it to facilitate the inclusion of any generic thread context alongside the spec-defined thread context types that it captures and propagates.
 
-With this model, the provider of thread context implements the `org.eclipse.microprofile.concurrent.spi.ThreadContextProvider` interface and packages it in a way that makes it available to the `ServiceLoader`. `ThreadContextProvider` identifies the thread context type and provides a way to capture snapshots of thread context as well as for applying empty/cleared context to threads.
+With this model, the provider of thread context implements the `org.eclipse.microprofile.context.spi.ThreadContextProvider` interface and packages it in a way that makes it available to the `ServiceLoader`. `ThreadContextProvider` identifies the thread context type and provides a way to capture snapshots of thread context as well as for applying empty/cleared context to threads.
 
 
 === Example
@@ -31,15 +31,15 @@ The example context type that it propagates is the priority of a thread. This is
 
 ==== ThreadContextProvider
 
-The interface, `org.eclipse.microprofile.concurrent.spi.ThreadContextProvider`, is the first point of interaction between the MicroProfile Concurrency implementation and a thread context provider. This interface is the means by which the MicroProfile Concurrency implementation requests the capturing of a particular context type from the current thread. It also provides a way to obtain a snapshot of empty/cleared context of this type and identifies the name by which the user refers to this context type when configuring a `ManagedExecutor` or `ThreadContext`.
+The interface, `org.eclipse.microprofile.context.spi.ThreadContextProvider`, is the first point of interaction between the MicroProfile Context Propagation implementation and a thread context provider. This interface is the means by which the MicroProfile Context Propagation implementation requests the capturing of a particular context type from the current thread. It also provides a way to obtain a snapshot of empty/cleared context of this type and identifies the name by which the user refers to this context type when configuring a `ManagedExecutor` or `ThreadContext`.
 
 [source, java]
 ----
 package org.eclipse.microprofile.example.context.priority;
 
 import java.util.Map;
-import org.eclipse.microprofile.concurrent.spi.ThreadContextProvider;
-import org.eclipse.microprofile.concurrent.spi.ThreadContextSnapshot;
+import org.eclipse.microprofile.context.spi.ThreadContextProvider;
+import org.eclipse.microprofile.context.spi.ThreadContextSnapshot;
 
 public class ThreadPriorityContextProvider implements ThreadContextProvider {
     public String getThreadContextType() {
@@ -58,15 +58,15 @@ public class ThreadPriorityContextProvider implements ThreadContextProvider {
 
 ==== ThreadContextSnapshot
 
-The interface, `org.eclipse.microprofile.concurrent.spi.ThreadContextSnapshot`, represents a snapshot of thread context. The MicroProfile Concurrency implementation can request the context represented by this snapshot to be applied to any number of threads by invoking the `begin` method. An instance of  `org.eclipse.microprofile.concurrent.spi.ThreadContextController`, which is returned by the `begin` method, stores the previous context of the thread. The `ThreadContextController` instance provided for one-time use by the MicroProfile Concurrency implementation to restore the previous context after the context represented by the snapshot is no longer needed on the thread.
+The interface, `org.eclipse.microprofile.context.spi.ThreadContextSnapshot`, represents a snapshot of thread context. The MicroProfile Context Propagation implementation can request the context represented by this snapshot to be applied to any number of threads by invoking the `begin` method. An instance of  `org.eclipse.microprofile.context.spi.ThreadContextController`, which is returned by the `begin` method, stores the previous context of the thread. The `ThreadContextController` instance provided for one-time use by the MicroProfile Context Propagation implementation to restore the previous context after the context represented by the snapshot is no longer needed on the thread.
 
 [source, java]
 ----
 package org.eclipse.microprofile.example.context.priority;
 
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.eclipse.microprofile.concurrent.spi.ThreadContextController;
-import org.eclipse.microprofile.concurrent.spi.ThreadContextSnapshot;
+import org.eclipse.microprofile.context.spi.ThreadContextController;
+import org.eclipse.microprofile.context.spi.ThreadContextSnapshot;
 
 public class ThreadPrioritySnapshot implements ThreadContextSnapshot {
     private final int priority;
@@ -99,7 +99,7 @@ public class ThreadPrioritySnapshot implements ThreadContextSnapshot {
 To make the `ThreadContextProvider` implementation available to the `ServiceLoader`, the provider JAR includes a file of the following name and location,
 
 ----
-META-INF/services/org.eclipse.microprofile.concurrent.spi.ThreadContextProvider
+META-INF/services/org.eclipse.microprofile.context.spi.ThreadContextProvider
 ----
 
 The content of the aforementioned file must be one or more lines, each specifying the fully qualified name of a `ThreadContextProvider` implementation that is provided within the JAR file. For our example context provider, this file consists of the following line:
diff --git a/spec/src/main/asciidoc/examples.asciidoc b/spec/src/main/asciidoc/examples.asciidoc
index 1be73af..72c3833 100644
--- a/spec/src/main/asciidoc/examples.asciidoc
+++ b/spec/src/main/asciidoc/examples.asciidoc
@@ -15,7 +15,7 @@
 //
 
 [[examples]]
-== MicroProfile Concurrency Examples
+== MicroProfile Context Propagation Examples
 
 This section includes some additional examples of spec usage.
 
diff --git a/spec/src/main/asciidoc/microprofile-concurrency.asciidoc b/spec/src/main/asciidoc/microprofile-context-propagation.asciidoc
similarity index 91%
rename from spec/src/main/asciidoc/microprofile-concurrency.asciidoc
rename to spec/src/main/asciidoc/microprofile-context-propagation.asciidoc
index f8bffcb..26f41c0 100644
--- a/spec/src/main/asciidoc/microprofile-concurrency.asciidoc
+++ b/spec/src/main/asciidoc/microprofile-context-propagation.asciidoc
@@ -17,7 +17,7 @@
 // limitations under the License.
 //
 
-= MicroProfile Concurrency
+= MicroProfile Context Propagation
 :authors: 
 :email: 
 :version-label!:
@@ -35,7 +35,7 @@ endif::[]
 
 include::license-alv2.asciidoc[]
 
-== Microprofile Concurrency
+== Microprofile Context Propagation
 
 include::overview.asciidoc[]
 
@@ -51,7 +51,7 @@ include::examples.asciidoc[]
 
 include::contextproviders.asciidoc[]
 
-include::concurrencyprovider.asciidoc[]
+include::contextmanagerprovider.asciidoc[]
 
 include::release_notes.asciidoc[]
 
diff --git a/spec/src/main/asciidoc/mpconfig.asciidoc b/spec/src/main/asciidoc/mpconfig.asciidoc
index b839ef5..d9c6a40 100644
--- a/spec/src/main/asciidoc/mpconfig.asciidoc
+++ b/spec/src/main/asciidoc/mpconfig.asciidoc
@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 
-[[concurrencympconfig]]
+[[mpconfig]]
 == Establishing default values with MicroProfile Config
 
 If a MicroProfile Config implementation is available, MicroProfile Config can be used to establish default values for configuration attributes of `ManagedExecutor` and `ThreadContext`. This allows the application to bypass configuration of one or more attributes when using the builders to create instances.
@@ -67,7 +67,7 @@ When using MicroProfile Config to define defaults for array type properties (`pr
 - Array elements can be any thread context type constant value from ThreadContext (such as `Security`, `Application`, or `Remaining`).
 - The usual rules from the MicroProfile Config specification apply, such as escaping special characters.
 
-In order to guarantee that empty string config values are interpreted properly, the MicroProfile Concurrency implementation must interpret both of the following as indicating empty:
+In order to guarantee that empty string config values are interpreted properly, the MicroProfile Context Propagation implementation must interpret both of the following as indicating empty:
 
 * empty array
 * array containing the empty String as its singular element
diff --git a/spec/src/main/asciidoc/overview.asciidoc b/spec/src/main/asciidoc/overview.asciidoc
index 626afa7..94f9369 100644
--- a/spec/src/main/asciidoc/overview.asciidoc
+++ b/spec/src/main/asciidoc/overview.asciidoc
@@ -14,12 +14,12 @@
 // limitations under the License.
 //
 
-[[concurrencyspec]]
-== MicroProfile Concurrency Specification
+[[contextpropagationspec]]
+== MicroProfile Context Propagation Specification
 
 === Introduction
 
-MicroProfile Concurrency introduces APIs for propagating contexts across units of work that are thread-agnostic. It makes it possible to propagate context that was traditionally associated to the current thread across various types of units of work such as `CompletionStage`, `CompletableFuture`, `Function`, `Runnable` regardless of which particular thread ends up executing them.
+The MicroProfile Context Propagation specification introduces APIs for propagating contexts across units of work that are thread-agnostic. It makes it possible to propagate context that was traditionally associated to the current thread across various types of units of work such as `CompletionStage`, `CompletableFuture`, `Function`, `Runnable` regardless of which particular thread ends up executing them.
 
 === Motivation
 
@@ -43,9 +43,9 @@ Goals
 
 This specification introduces two interfaces that contain methods that can work alongside EE Concurrency, if available.
 
-The interface, `org.eclipse.microprofile.concurrent.ManagedExecutor`, provides methods for obtaining managed instances of `CompletableFuture` which are backed by the managed executor as the default asynchronous execution facility and the default mechanism of defining thread context propagation. Similar to EE Concurrency’s `ManagedExecutorService`, the MicroProfile `ManagedExecutor` also implements the Java SE `java.util.concurrent.ExecutorService` interface, using managed threads when asynchronous invocation is required. It is possible for a single implementation to be capable of simultaneously implementing both `ManagedExecutor` and `ManagedExecutorService` interfaces.
+The interface, `org.eclipse.microprofile.context.ManagedExecutor`, provides methods for obtaining managed instances of `CompletableFuture` which are backed by the managed executor as the default asynchronous execution facility and the default mechanism of defining thread context propagation. Similar to EE Concurrency’s `ManagedExecutorService`, the MicroProfile `ManagedExecutor` also implements the Java SE `java.util.concurrent.ExecutorService` interface, using managed threads when asynchronous invocation is required. It is possible for a single implementation to be capable of simultaneously implementing both `ManagedExecutor` and `ManagedExecutorService` interfaces.
 
-A second interface, `org.eclipse.microprofile.concurrent.ThreadContext`, provides methods for individually contextualizing units of work such as `CompletionStage`, `CompletionFuture`, `Runnable`, `Function`, `Supplier` and more, without tying them to a particular thread execution model. This gives the user finer-grained control over the capture and propagation of thread context by remaining thread execution agnostic. It is possible for a single implementation to be capable of simultaneously implementing both `ThreadContext` and `ContextService` interfaces.
+A second interface, `org.eclipse.microprofile.context.ThreadContext`, provides methods for individually contextualizing units of work such as `CompletionStage`, `CompletionFuture`, `Runnable`, `Function`, `Supplier` and more, without tying them to a particular thread execution model. This gives the user finer-grained control over the capture and propagation of thread context by remaining thread execution agnostic. It is possible for a single implementation to be capable of simultaneously implementing both `ThreadContext` and `ContextService` interfaces.
 
 === Builders
 
diff --git a/spec/src/main/asciidoc/release_notes.asciidoc b/spec/src/main/asciidoc/release_notes.asciidoc
index 074c923..bf9b830 100644
--- a/spec/src/main/asciidoc/release_notes.asciidoc
+++ b/spec/src/main/asciidoc/release_notes.asciidoc
@@ -17,11 +17,11 @@
 // limitations under the License.
 
 [[release_notes_10]]
-== Release Notes for MicroProfile Concurrency 1.0
+== Release Notes for MicroProfile Context Propagation 1.0
 
-http://download.eclipse.org/microprofile/microprofile-concurrency-1.0/microprofile-concurrency.pdf[MicroProfile Concurrency Spec PDF]
-http://download.eclipse.org/microprofile/microprofile-concurrency-1.0/microprofile-concurrency.html[MicroProfile Concurrency Spec HTML]
-http://download.eclipse.org/microprofile/microprofile-concurrency-1.0/apidocs/[MicroProfile Concurrency Spec Javadocs]
+http://download.eclipse.org/microprofile/microprofile-context-propagation-1.0/microprofile-context-propagation.pdf[MicroProfile Context Propagation Spec PDF]
+http://download.eclipse.org/microprofile/microprofile-context-propagation-1.0/microprofile-context-propagation.html[MicroProfile Context Propagation Spec HTML]
+http://download.eclipse.org/microprofile/microprofile-context-propagation-1.0/apidocs/[MicroProfile Context Propagation Spec Javadocs]
 
 Key features:
 
@@ -36,8 +36,8 @@ To get started, add this dependency to your project:
 [source,xml]
 ----
 <dependency>
-    <groupId>org.eclipse.microprofile.concurrency</groupId>
-    <artifactId>microprofile-concurrency-api</artifactId>
+    <groupId>org.eclipse.microprofile.context-propagation</groupId>
+    <artifactId>microprofile-context-propagation-api</artifactId>
     <version>1.0</version>
     <scope>provided</scope>
 </dependency>
diff --git a/spec/src/main/asciidoc/txcontext.asciidoc b/spec/src/main/asciidoc/txcontext.asciidoc
index be5f1c7..e6fba41 100644
--- a/spec/src/main/asciidoc/txcontext.asciidoc
+++ b/spec/src/main/asciidoc/txcontext.asciidoc
@@ -14,10 +14,10 @@
 // limitations under the License.
 //
 
-[[concurrencytxcontext]]
+[[txcontext]]
 == Transaction Context
 
-Implementations of MicroProfile Concurrency are allowed to provide varying degrees of support for transaction context.
+Implementations of MicroProfile Context Propagation are allowed to provide varying degrees of support for transaction context.
 
 This varies from not supporting transactions at all, to supporting the clearing of transaction context only, to supporting propagation of transactions for serial, or even parallel use.  The `ThreadContextProvider` for transaction context raises exceptions that are defined by the specification to indicate lack of support for the various optional aspects of transaction context propagation.
 
diff --git a/tck/pom.xml b/tck/pom.xml
index 60cb20b..f23ced8 100644
--- a/tck/pom.xml
+++ b/tck/pom.xml
@@ -15,12 +15,12 @@
     xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.eclipse.microprofile.concurrency</groupId>
-        <artifactId>microprofile-concurrency-parent</artifactId>
+        <groupId>org.eclipse.microprofile.context-propagation</groupId>
+        <artifactId>microprofile-context-propagation-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
-    <artifactId>microprofile-concurrency-tck</artifactId>
-    <name>microprofile-concurrency-tck</name>
+    <artifactId>microprofile-context-propagation-tck</artifactId>
+    <name>microprofile-context-propagation-tck</name>
     <url>http://maven.apache.org</url>
     <properties>
         <arquillian.version>1.4.0.Final</arquillian.version>
@@ -54,8 +54,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.eclipse.microprofile.concurrency</groupId>
-            <artifactId>microprofile-concurrency-api</artifactId>
+            <groupId>org.eclipse.microprofile.context-propagation</groupId>
+            <artifactId>microprofile-context-propagation-api</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
diff --git a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/ConcurrencyManagerTest.java b/tck/src/main/java/org/eclipse/microprofile/context/tck/ContextManagerTest.java
similarity index 58%
rename from tck/src/main/java/org/eclipse/microprofile/concurrency/tck/ConcurrencyManagerTest.java
rename to tck/src/main/java/org/eclipse/microprofile/context/tck/ContextManagerTest.java
index b9ba288..347e951 100644
--- a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/ConcurrencyManagerTest.java
+++ b/tck/src/main/java/org/eclipse/microprofile/context/tck/ContextManagerTest.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.microprofile.concurrency.tck;
+package org.eclipse.microprofile.context.tck;
 
 import java.lang.reflect.Method;
 
@@ -33,7 +33,7 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-public class ConcurrencyManagerTest extends Arquillian {
+public class ContextManagerTest extends Arquillian {
 
     @AfterMethod
     public void afterMethod(Method m, ITestResult result) {
@@ -51,65 +51,65 @@ public void beforeMethod(Method m) {
 
     @Deployment
     public static WebArchive createDeployment() {
-        return ShrinkWrap.create(WebArchive.class, ConcurrencyManagerTest.class.getSimpleName() + ".war")
-                .addClass(ConcurrencyManagerTest.class);
+        return ShrinkWrap.create(WebArchive.class, ContextManagerTest.class.getSimpleName() + ".war")
+                .addClass(ContextManagerTest.class);
     }
 
     /**
-     * Verify obtaining a ConcurrencyManager builder from the ConcurrencyProvider. Then validate building,
-     * registering, and releasing a custom ConcurrencyManager. If a ConcurrencyManager builder is not supported
+     * Verify obtaining a ContextManager builder from the ContextManagerProvider. Then validate building,
+     * registering, and releasing a custom ContextManager. If a ContextManager builder is not supported
      * then this test will no-op.
      */
     @Test
-    public void builderForConcurrencyManagerIsProvided() {
+    public void builderForContextManagerIsProvided() {
         ConcurrencyProvider provider = ConcurrencyProvider.instance();
-        ClassLoader classLoader = ConcurrencyManagerTest.class.getClassLoader();
-        Builder concurrencyManagerBuilder = null;
+        ClassLoader classLoader = ContextManagerTest.class.getClassLoader();
+        Builder contextManagerBuilder = null;
 
         try {
-            //obtain the ConcurrencyManagerBuilder
-            concurrencyManagerBuilder = provider.getConcurrencyManagerBuilder();
-            Assert.assertNotNull(concurrencyManagerBuilder,
-                    "MicroProfile Concurrency implementation does not provide a ConcurrencyManager builder.");
+            //obtain the ContextManagerBuilder
+            contextManagerBuilder = provider.getConcurrencyManagerBuilder();
+            Assert.assertNotNull(contextManagerBuilder,
+                    "MicroProfile Context Propagation implementation does not provide a ContextManager builder.");
         } 
         catch (UnsupportedOperationException ex1) {
-            //ConcurrencyProvider.getConcurrencyManagerBuilder() support is optional.
-            System.out.println("ConcurrencyProvider.getConcurrencyManagerBuilder is not supported.");
+            //ContextManagerProvider.getContextManagerBuilder() support is optional.
+            System.out.println("ContextManagerProvider.getContextManagerBuilder is not supported.");
 
-            //Verify ConcurrencyProvider.registerConcurrencyManager() is also unsupported.
+            //Verify ContextManagerProvider.registerContextManager() is also unsupported.
             try {
                 provider.registerConcurrencyManager(provider.getConcurrencyManager(), classLoader);
-                Assert.fail("ConcurrencyProvider.registerConcurrencyManager should not be supported, "
-                        + "if ConcurrencyProvider.getConcurrencyManagerBuilder is not supported.");
+                Assert.fail("ContextManagerProvider.registerContextManager should not be supported, "
+                        + "if ContextManagerProvider.getContextManagerBuilder is not supported.");
             }
             catch (UnsupportedOperationException ex2) {
-                System.out.println("ConcurrencyProvider.registerConcurrencyManager is not supported.");
+                System.out.println("ContextManagerProvider.registerContextManager is not supported.");
             }
 
-            //Verify ConcurrencyProvider.releaseConcurrencyManager() is also unsupported.
+            //Verify ContextManagerProvider.releaseContextManager() is also unsupported.
             try {
                 provider.releaseConcurrencyManager(provider.getConcurrencyManager());
-                Assert.fail("ConcurrencyProvider.releaseConcurrencyManager should not be supported, "
-                        + "if ConcurrencyProvider.getConcurrencyManagerBuilder is not supported.");
+                Assert.fail("ContextManagerProvider.releaseContextManager should not be supported, "
+                        + "if ContextManagerProvider.getContextManagerBuilder is not supported.");
             }
             catch (UnsupportedOperationException ex3) {
-                System.out.println("ConcurrencyProvider.releaseConcurrencyManager is not supported.");
+                System.out.println("ContextManagerProvider.releaseContextManager is not supported.");
             }
 
             //Unsupported path of test has passed.
             return;
         }   
 
-        //build and register a ConcurrencyManager
-        ConcurrencyManager builtManager = concurrencyManagerBuilder.build();
+        //build and register a ContextManager
+        ConcurrencyManager builtManager = contextManagerBuilder.build();
         provider.registerConcurrencyManager(builtManager, classLoader);
         ConcurrencyManager registeredManager = provider.getConcurrencyManager(classLoader);
         Assert.assertEquals(builtManager, registeredManager,
-                "ConcurrencyManager.getConcurrencyManager(classLoader) did not return the same manager that was registered.");
+                "ContextManagerProvider.getContextManager(classLoader) did not return the same manager that was registered.");
 
-        //release the ConcurrencyManager
+        //release the ContextManager
         provider.releaseConcurrencyManager(registeredManager);
         Assert.assertNotEquals(builtManager, provider.getConcurrencyManager(classLoader),
-                "ConcurrencyManager was not released from the ConcurencyProvider.");
+                "ContextManager was not released from the ContextManagerProvider.");
     }
 }
diff --git a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/MPConfigBean.java b/tck/src/main/java/org/eclipse/microprofile/context/tck/MPConfigBean.java
similarity index 94%
rename from tck/src/main/java/org/eclipse/microprofile/concurrency/tck/MPConfigBean.java
rename to tck/src/main/java/org/eclipse/microprofile/context/tck/MPConfigBean.java
index 42ea0f8..9292c00 100644
--- a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/MPConfigBean.java
+++ b/tck/src/main/java/org/eclipse/microprofile/context/tck/MPConfigBean.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.microprofile.concurrency.tck;
+package org.eclipse.microprofile.context.tck;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -32,8 +32,8 @@
 import javax.inject.Named;
 import javax.inject.Qualifier;
 
-import org.eclipse.microprofile.concurrency.tck.contexts.buffer.Buffer;
-import org.eclipse.microprofile.concurrency.tck.contexts.label.Label;
+import org.eclipse.microprofile.context.tck.contexts.buffer.Buffer;
+import org.eclipse.microprofile.context.tck.contexts.label.Label;
 
 import org.eclipse.microprofile.concurrent.ManagedExecutor;
 import org.eclipse.microprofile.concurrent.ThreadContext;
diff --git a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/MPConfigTest.java b/tck/src/main/java/org/eclipse/microprofile/context/tck/MPConfigTest.java
similarity index 96%
rename from tck/src/main/java/org/eclipse/microprofile/concurrency/tck/MPConfigTest.java
rename to tck/src/main/java/org/eclipse/microprofile/context/tck/MPConfigTest.java
index a56f90a..7849022 100644
--- a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/MPConfigTest.java
+++ b/tck/src/main/java/org/eclipse/microprofile/context/tck/MPConfigTest.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.microprofile.concurrency.tck;
+package org.eclipse.microprofile.context.tck;
 
 import java.lang.reflect.Method;
 import java.util.concurrent.CompletableFuture;
@@ -31,12 +31,12 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import org.eclipse.microprofile.concurrency.tck.MPConfigBean.Max5Queue;
-import org.eclipse.microprofile.concurrency.tck.contexts.buffer.Buffer;
-import org.eclipse.microprofile.concurrency.tck.contexts.buffer.spi.BufferContextProvider;
-import org.eclipse.microprofile.concurrency.tck.contexts.label.Label;
-import org.eclipse.microprofile.concurrency.tck.contexts.label.spi.LabelContextProvider;
-import org.eclipse.microprofile.concurrency.tck.contexts.priority.spi.ThreadPriorityContextProvider;
+import org.eclipse.microprofile.context.tck.MPConfigBean.Max5Queue;
+import org.eclipse.microprofile.context.tck.contexts.buffer.Buffer;
+import org.eclipse.microprofile.context.tck.contexts.buffer.spi.BufferContextProvider;
+import org.eclipse.microprofile.context.tck.contexts.label.Label;
+import org.eclipse.microprofile.context.tck.contexts.label.spi.LabelContextProvider;
+import org.eclipse.microprofile.context.tck.contexts.priority.spi.ThreadPriorityContextProvider;
 import org.eclipse.microprofile.concurrent.ManagedExecutor;
 import org.eclipse.microprofile.concurrent.ThreadContext;
 import org.eclipse.microprofile.concurrent.spi.ThreadContextProvider;
@@ -88,9 +88,9 @@ public void beforeMethod(Method m) {
     public static WebArchive createDeployment() {
         // build a JAR that provides three fake context types: 'Buffer', 'Label', and 'ThreadPriority'
         JavaArchive fakeContextProviders = ShrinkWrap.create(JavaArchive.class, "fakeContextTypes.jar")
-                .addPackages(true, "org.eclipse.microprofile.concurrency.tck.contexts.buffer")
-                .addPackages(true, "org.eclipse.microprofile.concurrency.tck.contexts.label")
-                .addPackage("org.eclipse.microprofile.concurrency.tck.contexts.priority.spi")
+                .addPackages(true, "org.eclipse.microprofile.context.tck.contexts.buffer")
+                .addPackages(true, "org.eclipse.microprofile.context.tck.contexts.label")
+                .addPackage("org.eclipse.microprofile.context.tck.contexts.priority.spi")
                 .addAsServiceProvider(ThreadContextProvider.class,
                         BufferContextProvider.class, LabelContextProvider.class, ThreadPriorityContextProvider.class);
 
diff --git a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/ManagedExecutorTest.java b/tck/src/main/java/org/eclipse/microprofile/context/tck/ManagedExecutorTest.java
similarity index 99%
rename from tck/src/main/java/org/eclipse/microprofile/concurrency/tck/ManagedExecutorTest.java
rename to tck/src/main/java/org/eclipse/microprofile/context/tck/ManagedExecutorTest.java
index 29cd113..3b08b42 100644
--- a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/ManagedExecutorTest.java
+++ b/tck/src/main/java/org/eclipse/microprofile/context/tck/ManagedExecutorTest.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.microprofile.concurrency.tck;
+package org.eclipse.microprofile.context.tck;
 
 import java.lang.annotation.Annotation;
 import java.io.CharConversionException;
@@ -51,11 +51,11 @@
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
-import org.eclipse.microprofile.concurrency.tck.contexts.buffer.Buffer;
-import org.eclipse.microprofile.concurrency.tck.contexts.buffer.spi.BufferContextProvider;
-import org.eclipse.microprofile.concurrency.tck.contexts.label.Label;
-import org.eclipse.microprofile.concurrency.tck.contexts.label.spi.LabelContextProvider;
-import org.eclipse.microprofile.concurrency.tck.contexts.priority.spi.ThreadPriorityContextProvider;
+import org.eclipse.microprofile.context.tck.contexts.buffer.Buffer;
+import org.eclipse.microprofile.context.tck.contexts.buffer.spi.BufferContextProvider;
+import org.eclipse.microprofile.context.tck.contexts.label.Label;
+import org.eclipse.microprofile.context.tck.contexts.label.spi.LabelContextProvider;
+import org.eclipse.microprofile.context.tck.contexts.priority.spi.ThreadPriorityContextProvider;
 import org.eclipse.microprofile.concurrent.ManagedExecutor;
 import org.eclipse.microprofile.concurrent.ThreadContext;
 import org.eclipse.microprofile.concurrent.spi.ThreadContextProvider;
@@ -114,9 +114,9 @@ public void beforeMethod(Method m) {
     public static WebArchive createDeployment() {
         // build a JAR that provides three fake context types: 'Buffer', 'Label', and 'ThreadPriority'
         JavaArchive fakeContextProviders = ShrinkWrap.create(JavaArchive.class, "fakeContextTypes.jar")
-                .addPackages(true, "org.eclipse.microprofile.concurrency.tck.contexts.buffer")
-                .addPackages(true, "org.eclipse.microprofile.concurrency.tck.contexts.label")
-                .addPackage("org.eclipse.microprofile.concurrency.tck.contexts.priority.spi")
+                .addPackages(true, "org.eclipse.microprofile.context.tck.contexts.buffer")
+                .addPackages(true, "org.eclipse.microprofile.context.tck.contexts.label")
+                .addPackage("org.eclipse.microprofile.context.tck.contexts.priority.spi")
                 .addAsServiceProvider(ThreadContextProvider.class,
                         BufferContextProvider.class, LabelContextProvider.class, ThreadPriorityContextProvider.class);
 
@@ -128,11 +128,11 @@ public static WebArchive createDeployment() {
     @Test
     public void builderForManagedExecutorIsProvided() {
         Assert.assertNotNull(ManagedExecutor.builder(),
-                "MicroProfile Concurrency implementation does not provide a ManagedExecutor builder.");
+                "MicroProfile Context Propagation implementation does not provide a ManagedExecutor builder.");
     }
 
     /**
-     * Verify that the MicroProfile Concurrency ManagedExecutor implementation clears context
+     * Verify that the ManagedExecutor implementation clears context
      * types that are not configured under propagated, or cleared.
      * @throws TimeoutException 
      * @throws ExecutionException 
@@ -236,7 +236,7 @@ public void completedFutureDependentStagesRunWithContext() throws ExecutionExcep
                         "Context type was not propagated to contextual action.");
 
                 // This stage runs inline on the same thread as the test, so alter the
-                // context here and later verify that the MicroProfile Concurrency implementation
+                // context here and later verify that the MicroProfile Context Propagation implementation
                 // properly restores it to the thread's previous value, which will be
                 // completedFuture-test-buffer-E at the point when this runs.
                 Buffer.set(new StringBuffer("completedFuture-test-buffer-D"));
@@ -365,7 +365,7 @@ public void completedStageDependentStagesRunWithContext() throws InterruptedExce
     }
     
     /**
-     * Verify the MicroProfile Concurrency implementation of propagate(), and cleared()
+     * Verify the MicroProfile Context Propagation implementation of propagate(), and cleared()
      * for ManagedExecutor.Builder.
      */
     @Test
@@ -1493,7 +1493,7 @@ public void propagateApplicationContext() throws ExecutionException, Interrupted
                 try {
                     // load a class from the application
                     ClassLoader loader = Thread.currentThread().getContextClassLoader();
-                    return loader.loadClass("org.eclipse.microprofile.concurrency.tck.contexts.label.Label");
+                    return loader.loadClass("org.eclipse.microprofile.context.tck.contexts.label.Label");
                 }
                 catch (ClassNotFoundException x) {
                     throw new CompletionException(x);
diff --git a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/TckTest.java b/tck/src/main/java/org/eclipse/microprofile/context/tck/TckTest.java
similarity index 94%
rename from tck/src/main/java/org/eclipse/microprofile/concurrency/tck/TckTest.java
rename to tck/src/main/java/org/eclipse/microprofile/context/tck/TckTest.java
index 6b96ed1..872bcb2 100644
--- a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/TckTest.java
+++ b/tck/src/main/java/org/eclipse/microprofile/context/tck/TckTest.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.microprofile.concurrency.tck;
+package org.eclipse.microprofile.context.tck;
 
 import java.lang.reflect.Method;
 
@@ -56,6 +56,6 @@ public static WebArchive createDeployment() {
     @Test
     public void providerSet() {
         ConcurrencyProvider provider = ConcurrencyProvider.instance();
-        Assert.assertNotNull(provider, "ConcurrencyProvider is not set");
+        Assert.assertNotNull(provider, "ContextManagerProvider is not set");
     }
 }
diff --git a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/ThreadContextTest.java b/tck/src/main/java/org/eclipse/microprofile/context/tck/ThreadContextTest.java
similarity index 94%
rename from tck/src/main/java/org/eclipse/microprofile/concurrency/tck/ThreadContextTest.java
rename to tck/src/main/java/org/eclipse/microprofile/context/tck/ThreadContextTest.java
index 373ef6f..bfafaee 100644
--- a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/ThreadContextTest.java
+++ b/tck/src/main/java/org/eclipse/microprofile/context/tck/ThreadContextTest.java
@@ -16,9 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.microprofile.concurrency.tck;
+package org.eclipse.microprofile.context.tck;
 
-import static org.eclipse.microprofile.concurrency.tck.contexts.priority.spi.ThreadPriorityContextProvider.THREAD_PRIORITY;
+import static org.eclipse.microprofile.context.tck.contexts.priority.spi.ThreadPriorityContextProvider.THREAD_PRIORITY;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationTargetException;
@@ -40,11 +40,11 @@
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
-import org.eclipse.microprofile.concurrency.tck.contexts.buffer.Buffer;
-import org.eclipse.microprofile.concurrency.tck.contexts.buffer.spi.BufferContextProvider;
-import org.eclipse.microprofile.concurrency.tck.contexts.label.Label;
-import org.eclipse.microprofile.concurrency.tck.contexts.label.spi.LabelContextProvider;
-import org.eclipse.microprofile.concurrency.tck.contexts.priority.spi.ThreadPriorityContextProvider;
+import org.eclipse.microprofile.context.tck.contexts.buffer.Buffer;
+import org.eclipse.microprofile.context.tck.contexts.buffer.spi.BufferContextProvider;
+import org.eclipse.microprofile.context.tck.contexts.label.Label;
+import org.eclipse.microprofile.context.tck.contexts.label.spi.LabelContextProvider;
+import org.eclipse.microprofile.context.tck.contexts.priority.spi.ThreadPriorityContextProvider;
 import org.eclipse.microprofile.concurrent.ManagedExecutor;
 import org.eclipse.microprofile.concurrent.ThreadContext;
 import org.eclipse.microprofile.concurrent.spi.ThreadContextProvider;
@@ -103,13 +103,13 @@ public void beforeMethod(Method m) {
     public static WebArchive createDeployment() {
         // build a JAR that provides fake 'ThreadPriority' context type
         JavaArchive threadPriorityContextProvider = ShrinkWrap.create(JavaArchive.class, "threadPriorityContext.jar")
-                .addPackage("org.eclipse.microprofile.concurrency.tck.contexts.priority.spi")
+                .addPackage("org.eclipse.microprofile.context.tck.contexts.priority.spi")
                 .addAsServiceProvider(ThreadContextProvider.class, ThreadPriorityContextProvider.class);
 
         // build a JAR that provides two fake context types: 'Buffer' and 'Label'
         JavaArchive multiContextProvider = ShrinkWrap.create(JavaArchive.class, "bufferAndLabelContext.jar")
-                .addPackages(true, "org.eclipse.microprofile.concurrency.tck.contexts.buffer")
-                .addPackages(true, "org.eclipse.microprofile.concurrency.tck.contexts.label")
+                .addPackages(true, "org.eclipse.microprofile.context.tck.contexts.buffer")
+                .addPackages(true, "org.eclipse.microprofile.context.tck.contexts.label")
                 .addAsServiceProvider(ThreadContextProvider.class, BufferContextProvider.class, LabelContextProvider.class);
 
         return ShrinkWrap.create(WebArchive.class, ThreadContextTest.class.getSimpleName() + ".war")
@@ -120,7 +120,7 @@ public static WebArchive createDeployment() {
     @Test
     public void builderForThreadContextIsProvided() {
         Assert.assertNotNull(ThreadContext.builder(),
-                "MicroProfile Concurrency implementation does not provide a ThreadContext builder.");
+                "MicroProfile Context Propagation implementation does not provide a ThreadContext builder.");
     }
 
     /**
@@ -203,7 +203,7 @@ public void clearTransactionContextJTA() throws Exception {
     }
 
     /**
-     * Verify that the MicroProfile Concurrency ThreadContext implementation clears context
+     * Verify that the ThreadContext implementation clears context
      * types that are not configured under propagated, unchanged, or cleared.
      * @throws Exception 
      */
@@ -257,7 +257,7 @@ public void clearUnspecifiedContexts() throws Exception {
     }
 
     /**
-     * Verify that the MicroProfile Concurrency ThreadContext implementation's contextualConsumer
+     * Verify that the ThreadContext's contextualConsumer
      * method can be used to wrap a BiConsumer instance with the context that is captured from the
      * current thread per the configuration of the ThreadContext builder, and that the context is
      * applied when the BiConsumer accept method runs. This test case aligns with use case of
@@ -282,8 +282,8 @@ public void contextualBiConsumerRunsWithContext() throws InterruptedException {
             CountDownLatch completed = new CountDownLatch(1);
 
             // CompletableFuture from Java SE is intentionally used here to avoid the context
-            // propagation guarantees of MicroProfile Concurrency's ManagedExecutor.
-            // This ensures we are testing that MicroProfile Concurrency's ThreadContext is
+            // propagation guarantees of ManagedExecutor.
+            // This ensures we are testing that ThreadContext is
             // doing the work to propagate the context rather than getting it from a
             // ManagedExecutor.
             CompletableFuture<String> stage1a = CompletableFuture.supplyAsync(() -> "supplied-value-A");
@@ -321,7 +321,7 @@ public void contextualBiConsumerRunsWithContext() throws InterruptedException {
     }
 
     /**
-     * Verify that the MicroProfile Concurrency ThreadContext implementation's contextualFunction
+     * Verify that the ThreadContext's contextualFunction
      * method can be used to wrap a BiFunction instance with the context that is captured from the
      * current thread per the configuration of the ThreadContext builder, and that the context is
      * applied when the BiFunction apply method runs. This test case aligns with use case of
@@ -342,8 +342,8 @@ public void contextualBiFunctionRunsWithContext()
             Label.set("contextualBiFunction-test-label");
 
             // CompletableFuture from Java SE is intentionally used here to avoid the context
-            // propagation guarantees of MicroProfile Concurrency's ManagedExecutor.
-            // This ensures we are testing that MicroProfile Concurrency's ThreadContext is
+            // propagation guarantees of ManagedExecutor.
+            // This ensures we are testing that ThreadContext is
             // doing the work to propagate the context rather than getting it from a
             // ManagedExecutor.
             CompletableFuture<Integer> stage1a = new CompletableFuture<Integer>();
@@ -383,7 +383,7 @@ public void contextualBiFunctionRunsWithContext()
     }
 
     /**
-     * Verify that the MicroProfile Concurrency ThreadContext implementation's contextualCallable
+     * Verify that the ThreadContext's contextualCallable
      * method can be used to wrap a Callable instance with the context that is captured from the
      * current thread per the configuration of the ThreadContext builder, and that the context is
      * applied when the Callable call method runs. This test case aligns with use case of
@@ -428,7 +428,7 @@ public void contextualCallableRunsWithContext()
     }
 
     /**
-     * Verify that the MicroProfile Concurrency ThreadContext implementation's contextualConsumer
+     * Verify that the ThreadContext's contextualConsumer
      * method can be used to wrap a Consumer instance with the context that is captured from the
      * current thread per the configuration of the ThreadContext builder, and that the context is
      * applied when the Consumer accept method runs. This test case aligns with use case of
@@ -456,8 +456,8 @@ public void contextualConsumerRunsWithContext() throws InterruptedException {
             // action, to eliminate the possibility that this triggers the action to run inline.
 
             // CompletableFuture from Java SE is intentionally used here to avoid the context
-            // propagation guarantees of MicroProfile Concurrency's ManagedExecutor.
-            // This ensures we are testing that MicroProfile Concurrency's ThreadContext is
+            // propagation guarantees of ManagedExecutor.
+            // This ensures we are testing that ThreadContext is
             // doing the work to propagate the context rather than getting it from a 
             // ManagedExecutor.
             CompletableFuture<String> stage1 = new CompletableFuture<String>();
@@ -492,7 +492,7 @@ public void contextualConsumerRunsWithContext() throws InterruptedException {
     }
 
     /**
-     * Verify that the MicroProfile Concurrency ThreadContext implementation's contextualFunction
+     * Verify that the ThreadContext's contextualFunction
      * method can be used to wrap a Function instance with the context that is captured from the
      * current thread per the configuration of the ThreadContext builder, and that the context is
      * applied when the Function apply method runs. This test case aligns with use case of
@@ -523,8 +523,8 @@ public void contextualFunctionRunsWithContext()
             });
 
             // CompletableFuture from Java SE is intentionally used here to avoid the context
-            // propagation guarantees of MicroProfile Concurrency's ManagedExecutor.
-            // This ensures we are testing that MicroProfile Concurrency's ThreadContext is
+            // propagation guarantees of ManagedExecutor.
+            // This ensures we are testing that ThreadContext is
             // doing the work to propagate the context rather than getting it from a
             // ManagedExecutor.
             CompletableFuture<Long> stage1 = new CompletableFuture<Long>();
@@ -554,7 +554,7 @@ public void contextualFunctionRunsWithContext()
     }
 
     /**
-     * Verify that the MicroProfile Concurrency ThreadContext implementation's contextualRunnable
+     * Verify that the ThreadContext's contextualRunnable
      * method can be used to wrap a Runnable instance with the context that is captured from the
      * current thread per the configuration of the ThreadContext builder, and that the context is
      * applied when the Runnable run method runs. This test case aligns with use case of
@@ -590,8 +590,8 @@ public void contextualRunnableRunsWithContext()
             Thread.currentThread().setPriority(originalPriority);
 
             // CompletableFuture from Java SE is intentionally used here to avoid the context
-            // propagation guarantees of MicroProfile Concurrency's ManagedExecutor.
-            // This ensures we are testing that MicroProfile Concurrency's ThreadContext is
+            // propagation guarantees of ManagedExecutor.
+            // This ensures we are testing that ThreadContext is
             // doing the work to propagate the context rather than getting it from a
             // ManagedExecutor.
             CompletableFuture<Void> stage1 = new CompletableFuture<Void>();
@@ -622,7 +622,7 @@ public void contextualRunnableRunsWithContext()
     }
     
     /**
-     * Verify that the MicroProfile Concurrency ThreadContext implementation's contextualSupplier
+     * Verify that the ThreadContext's contextualSupplier
      * method can be used to wrap a Supplier instance with the context that is captured from the
      * current thread per the configuration of the ThreadContext builder, and that the context is
      * applied when the Supplier get method runs. This test case aligns with use case of
@@ -647,8 +647,8 @@ public void contextualSupplierRunsWithContext() throws InterruptedException {
             CountDownLatch completed = new CountDownLatch(1);
 
             // CompletableFuture from Java SE is intentionally used here to avoid the context
-            // propagation guarantees of MicroProfile Concurrency's ManagedExecutor.
-            // This ensures we are testing that MicroProfile Concurrency's ThreadContext is
+            // propagation guarantees of ManagedExecutor.
+            // This ensures we are testing that ThreadContext is
             // doing the work to propagate the context rather than getting it from a 
             // ManagedExecutor.
             CompletableFuture<String> stage1 = CompletableFuture.supplyAsync(
@@ -744,10 +744,10 @@ public void reuseThreadContextBuilder() throws Exception {
     }
 
     /**
-     * Verify that the MicroProfile Concurrency implementation finds third-party thread context providers
+     * Verify that the MicroProfile Context Propagation implementation finds third-party thread context providers
      * that are made available to the ServiceLoader, allows their configuration via the ThreadContext builder,
      * and correctly captures & propagates or clears these thread context types per the builder configuration.
-     * Subsequently verify that the MicroProfile Concurrency implementation properly restores thread context
+     * Subsequently verify that the MicroProfile Context Propagation implementation properly restores thread context
      * after the contextual action completes.
      */
     @Test
@@ -805,7 +805,7 @@ public void thirdPartyContextProvidersAreIncludedInThreadContext() {
     }
 
     /**
-     * Verify that the MicroProfile Concurrency ThreadContext implementation's withContextCapture
+     * Verify that the ThreadContext's withContextCapture
      * method can be used to create a dependent CompletableFuture instance that completes when the
      * original stage completes and runs dependent stage actions with context that is captured
      * from the thread that creates the dependent stage.
@@ -911,7 +911,7 @@ public void withContextCaptureDependentCompletableFuturesRunWithContext()
     }
 
     /**
-     * Verify that the MicroProfile Concurrency ThreadContext implementation's withContextCapture
+     * Verify that the ThreadContext's withContextCapture
      * method can be used to create a dependent CompletionStage instance that completes when the
      * original stage completes and runs dependent stage actions with context that is captured
      * from the thread that creates the dependent stage.
@@ -1158,7 +1158,7 @@ public void withContextCaptureSwitchThreadContext()
     }
 
     /**
-     * Verify the MicroProfile Concurrency implementation of propagate(), cleared(), and unchanged()
+     * Verify the MicroProfile Context Propagation implementation of propagate(), cleared(), and unchanged()
      * for ThreadContext.Builder.
      */
     @Test
@@ -1244,7 +1244,7 @@ public void contextControlsForThreadContextBuilder() throws InterruptedException
     }
 
     /**
-     * Verify that the MicroProfile Concurrency ThreadContext implementation's currentContextExecutor
+     * Verify that the ThreadContext's currentContextExecutor
      * method can be used to create an Executor instance with the context that is captured from the
      * current thread per the configuration of the ThreadContext builder, and that the context is
      * applied to the thread where the Executor's execute method runs. This test case aligns with use 
diff --git a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/cdi/AbstractBean.java b/tck/src/main/java/org/eclipse/microprofile/context/tck/cdi/AbstractBean.java
similarity index 95%
rename from tck/src/main/java/org/eclipse/microprofile/concurrency/tck/cdi/AbstractBean.java
rename to tck/src/main/java/org/eclipse/microprofile/context/tck/cdi/AbstractBean.java
index 3b198c3..f485368 100644
--- a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/cdi/AbstractBean.java
+++ b/tck/src/main/java/org/eclipse/microprofile/context/tck/cdi/AbstractBean.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.microprofile.concurrency.tck.cdi;
+package org.eclipse.microprofile.context.tck.cdi;
 
 public abstract class AbstractBean {
 
diff --git a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/cdi/BasicCDITest.java b/tck/src/main/java/org/eclipse/microprofile/context/tck/cdi/BasicCDITest.java
similarity index 87%
rename from tck/src/main/java/org/eclipse/microprofile/concurrency/tck/cdi/BasicCDITest.java
rename to tck/src/main/java/org/eclipse/microprofile/context/tck/cdi/BasicCDITest.java
index 6a00372..c5ef431 100644
--- a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/cdi/BasicCDITest.java
+++ b/tck/src/main/java/org/eclipse/microprofile/context/tck/cdi/BasicCDITest.java
@@ -16,15 +16,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.microprofile.concurrency.tck.cdi;
+package org.eclipse.microprofile.context.tck.cdi;
 
 import java.lang.reflect.Method;
 
 import javax.inject.Inject;
 
-import org.eclipse.microprofile.concurrency.tck.contexts.buffer.spi.BufferContextProvider;
-import org.eclipse.microprofile.concurrency.tck.contexts.label.spi.LabelContextProvider;
-import org.eclipse.microprofile.concurrency.tck.contexts.priority.spi.ThreadPriorityContextProvider;
+import org.eclipse.microprofile.context.tck.contexts.buffer.spi.BufferContextProvider;
+import org.eclipse.microprofile.context.tck.contexts.label.spi.LabelContextProvider;
+import org.eclipse.microprofile.context.tck.contexts.priority.spi.ThreadPriorityContextProvider;
 import org.eclipse.microprofile.concurrent.spi.ThreadContextProvider;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.testng.Arquillian;
@@ -62,9 +62,9 @@ public void beforeMethod(Method m) {
     public static WebArchive createDeployment() {
         // build a JAR that provides three fake context types: 'Buffer', 'Label', and 'ThreadPriority'
         JavaArchive fakeContextProviders = ShrinkWrap.create(JavaArchive.class, "fakeContextTypes.jar")
-                .addPackages(true, "org.eclipse.microprofile.concurrency.tck.contexts.buffer")
-                .addPackages(true, "org.eclipse.microprofile.concurrency.tck.contexts.label")
-                .addPackage("org.eclipse.microprofile.concurrency.tck.contexts.priority.spi")
+                .addPackages(true, "org.eclipse.microprofile.context.tck.contexts.buffer")
+                .addPackages(true, "org.eclipse.microprofile.context.tck.contexts.label")
+                .addPackage("org.eclipse.microprofile.context.tck.contexts.priority.spi")
                 .addAsServiceProvider(ThreadContextProvider.class,
                         BufferContextProvider.class, LabelContextProvider.class, ThreadPriorityContextProvider.class);
 
diff --git a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/cdi/CDIBean.java b/tck/src/main/java/org/eclipse/microprofile/context/tck/cdi/CDIBean.java
similarity index 96%
rename from tck/src/main/java/org/eclipse/microprofile/concurrency/tck/cdi/CDIBean.java
rename to tck/src/main/java/org/eclipse/microprofile/context/tck/cdi/CDIBean.java
index b74abb6..1575681 100644
--- a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/cdi/CDIBean.java
+++ b/tck/src/main/java/org/eclipse/microprofile/context/tck/cdi/CDIBean.java
@@ -16,9 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.microprofile.concurrency.tck.cdi;
+package org.eclipse.microprofile.context.tck.cdi;
 
-import static org.eclipse.microprofile.concurrency.tck.contexts.priority.spi.ThreadPriorityContextProvider.THREAD_PRIORITY;
+import static org.eclipse.microprofile.context.tck.contexts.priority.spi.ThreadPriorityContextProvider.THREAD_PRIORITY;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.*;
 
@@ -34,8 +34,8 @@
 import javax.inject.Inject;
 import javax.inject.Qualifier;
 
-import org.eclipse.microprofile.concurrency.tck.contexts.buffer.Buffer;
-import org.eclipse.microprofile.concurrency.tck.contexts.label.Label;
+import org.eclipse.microprofile.context.tck.contexts.buffer.Buffer;
+import org.eclipse.microprofile.context.tck.contexts.label.Label;
 import org.eclipse.microprofile.concurrent.ManagedExecutor;
 import org.eclipse.microprofile.concurrent.ThreadContext;
 import org.testng.Assert;
diff --git a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/cdi/CDIContextTest.java b/tck/src/main/java/org/eclipse/microprofile/context/tck/cdi/CDIContextTest.java
similarity index 99%
rename from tck/src/main/java/org/eclipse/microprofile/concurrency/tck/cdi/CDIContextTest.java
rename to tck/src/main/java/org/eclipse/microprofile/context/tck/cdi/CDIContextTest.java
index f247143..d0405d8 100644
--- a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/cdi/CDIContextTest.java
+++ b/tck/src/main/java/org/eclipse/microprofile/context/tck/cdi/CDIContextTest.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.microprofile.concurrency.tck.cdi;
+package org.eclipse.microprofile.context.tck.cdi;
 
 import static org.testng.Assert.assertEquals;
 
diff --git a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/cdi/ConversationScopeBean.java b/tck/src/main/java/org/eclipse/microprofile/context/tck/cdi/ConversationScopeBean.java
similarity index 94%
rename from tck/src/main/java/org/eclipse/microprofile/concurrency/tck/cdi/ConversationScopeBean.java
rename to tck/src/main/java/org/eclipse/microprofile/context/tck/cdi/ConversationScopeBean.java
index 2be3136..b6aac85 100644
--- a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/cdi/ConversationScopeBean.java
+++ b/tck/src/main/java/org/eclipse/microprofile/context/tck/cdi/ConversationScopeBean.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.microprofile.concurrency.tck.cdi;
+package org.eclipse.microprofile.context.tck.cdi;
 
 import java.io.Serializable;
 
diff --git a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/cdi/JTACDITest.java b/tck/src/main/java/org/eclipse/microprofile/context/tck/cdi/JTACDITest.java
similarity index 99%
rename from tck/src/main/java/org/eclipse/microprofile/concurrency/tck/cdi/JTACDITest.java
rename to tck/src/main/java/org/eclipse/microprofile/context/tck/cdi/JTACDITest.java
index b853b91..66962a7 100644
--- a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/cdi/JTACDITest.java
+++ b/tck/src/main/java/org/eclipse/microprofile/context/tck/cdi/JTACDITest.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.microprofile.concurrency.tck.cdi;
+package org.eclipse.microprofile.context.tck.cdi;
 
 import org.eclipse.microprofile.concurrent.ManagedExecutor;
 import org.eclipse.microprofile.concurrent.ThreadContext;
diff --git a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/cdi/RequestScopedBean.java b/tck/src/main/java/org/eclipse/microprofile/context/tck/cdi/RequestScopedBean.java
similarity index 94%
rename from tck/src/main/java/org/eclipse/microprofile/concurrency/tck/cdi/RequestScopedBean.java
rename to tck/src/main/java/org/eclipse/microprofile/context/tck/cdi/RequestScopedBean.java
index 23480ae..7b01c33 100644
--- a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/cdi/RequestScopedBean.java
+++ b/tck/src/main/java/org/eclipse/microprofile/context/tck/cdi/RequestScopedBean.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.microprofile.concurrency.tck.cdi;
+package org.eclipse.microprofile.context.tck.cdi;
 
 import javax.enterprise.context.RequestScoped;
 
diff --git a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/cdi/SessionScopedBean.java b/tck/src/main/java/org/eclipse/microprofile/context/tck/cdi/SessionScopedBean.java
similarity index 94%
rename from tck/src/main/java/org/eclipse/microprofile/concurrency/tck/cdi/SessionScopedBean.java
rename to tck/src/main/java/org/eclipse/microprofile/context/tck/cdi/SessionScopedBean.java
index 4637ad7..1f82113 100644
--- a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/cdi/SessionScopedBean.java
+++ b/tck/src/main/java/org/eclipse/microprofile/context/tck/cdi/SessionScopedBean.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.microprofile.concurrency.tck.cdi;
+package org.eclipse.microprofile.context.tck.cdi;
 
 import java.io.Serializable;
 
diff --git a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/cdi/TransactionalBean.java b/tck/src/main/java/org/eclipse/microprofile/context/tck/cdi/TransactionalBean.java
similarity index 93%
rename from tck/src/main/java/org/eclipse/microprofile/concurrency/tck/cdi/TransactionalBean.java
rename to tck/src/main/java/org/eclipse/microprofile/context/tck/cdi/TransactionalBean.java
index a17b7d0..aa5777d 100644
--- a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/cdi/TransactionalBean.java
+++ b/tck/src/main/java/org/eclipse/microprofile/context/tck/cdi/TransactionalBean.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.microprofile.concurrency.tck.cdi;
+package org.eclipse.microprofile.context.tck.cdi;
 
 public interface TransactionalBean {
     int getValue();
diff --git a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/cdi/TransactionalBeanImpl.java b/tck/src/main/java/org/eclipse/microprofile/context/tck/cdi/TransactionalBeanImpl.java
similarity index 95%
rename from tck/src/main/java/org/eclipse/microprofile/concurrency/tck/cdi/TransactionalBeanImpl.java
rename to tck/src/main/java/org/eclipse/microprofile/context/tck/cdi/TransactionalBeanImpl.java
index 8065401..bce1126 100644
--- a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/cdi/TransactionalBeanImpl.java
+++ b/tck/src/main/java/org/eclipse/microprofile/context/tck/cdi/TransactionalBeanImpl.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.microprofile.concurrency.tck.cdi;
+package org.eclipse.microprofile.context.tck.cdi;
 
 import javax.transaction.TransactionScoped;
 import java.io.Serializable;
diff --git a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/cdi/TransactionalService.java b/tck/src/main/java/org/eclipse/microprofile/context/tck/cdi/TransactionalService.java
similarity index 98%
rename from tck/src/main/java/org/eclipse/microprofile/concurrency/tck/cdi/TransactionalService.java
rename to tck/src/main/java/org/eclipse/microprofile/context/tck/cdi/TransactionalService.java
index 1f7aa6d..18d2f89 100644
--- a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/cdi/TransactionalService.java
+++ b/tck/src/main/java/org/eclipse/microprofile/context/tck/cdi/TransactionalService.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.microprofile.concurrency.tck.cdi;
+package org.eclipse.microprofile.context.tck.cdi;
 
 import org.eclipse.microprofile.concurrent.ManagedExecutor;
 
diff --git a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/contexts/buffer/Buffer.java b/tck/src/main/java/org/eclipse/microprofile/context/tck/contexts/buffer/Buffer.java
similarity index 95%
rename from tck/src/main/java/org/eclipse/microprofile/concurrency/tck/contexts/buffer/Buffer.java
rename to tck/src/main/java/org/eclipse/microprofile/context/tck/contexts/buffer/Buffer.java
index dceeeb9..0fc51f8 100644
--- a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/contexts/buffer/Buffer.java
+++ b/tck/src/main/java/org/eclipse/microprofile/context/tck/contexts/buffer/Buffer.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.microprofile.concurrency.tck.contexts.buffer;
+package org.eclipse.microprofile.context.tck.contexts.buffer;
 
 /**
  * This is a fake context type that is created by the test suite.
diff --git a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/contexts/buffer/spi/BufferContextProvider.java b/tck/src/main/java/org/eclipse/microprofile/context/tck/contexts/buffer/spi/BufferContextProvider.java
similarity index 89%
rename from tck/src/main/java/org/eclipse/microprofile/concurrency/tck/contexts/buffer/spi/BufferContextProvider.java
rename to tck/src/main/java/org/eclipse/microprofile/context/tck/contexts/buffer/spi/BufferContextProvider.java
index b9b975a..dde00c2 100644
--- a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/contexts/buffer/spi/BufferContextProvider.java
+++ b/tck/src/main/java/org/eclipse/microprofile/context/tck/contexts/buffer/spi/BufferContextProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ * Copyright (c) 2018,2019 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -16,11 +16,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.microprofile.concurrency.tck.contexts.buffer.spi;
+package org.eclipse.microprofile.context.tck.contexts.buffer.spi;
 
 import java.util.Map;
 
-import org.eclipse.microprofile.concurrency.tck.contexts.buffer.Buffer;
+import org.eclipse.microprofile.context.tck.contexts.buffer.Buffer;
 import org.eclipse.microprofile.concurrent.spi.ThreadContextProvider;
 import org.eclipse.microprofile.concurrent.spi.ThreadContextSnapshot;
 
diff --git a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/contexts/buffer/spi/BufferContextRestorer.java b/tck/src/main/java/org/eclipse/microprofile/context/tck/contexts/buffer/spi/BufferContextRestorer.java
similarity index 89%
rename from tck/src/main/java/org/eclipse/microprofile/concurrency/tck/contexts/buffer/spi/BufferContextRestorer.java
rename to tck/src/main/java/org/eclipse/microprofile/context/tck/contexts/buffer/spi/BufferContextRestorer.java
index 0bb87bd..0982640 100644
--- a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/contexts/buffer/spi/BufferContextRestorer.java
+++ b/tck/src/main/java/org/eclipse/microprofile/context/tck/contexts/buffer/spi/BufferContextRestorer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ * Copyright (c) 2018,2019 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -16,11 +16,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.microprofile.concurrency.tck.contexts.buffer.spi;
+package org.eclipse.microprofile.context.tck.contexts.buffer.spi;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.eclipse.microprofile.concurrency.tck.contexts.buffer.Buffer;
+import org.eclipse.microprofile.context.tck.contexts.buffer.Buffer;
 import org.eclipse.microprofile.concurrent.spi.ThreadContextController;
 
 /**
diff --git a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/contexts/buffer/spi/BufferContextSnapshot.java b/tck/src/main/java/org/eclipse/microprofile/context/tck/contexts/buffer/spi/BufferContextSnapshot.java
similarity index 90%
rename from tck/src/main/java/org/eclipse/microprofile/concurrency/tck/contexts/buffer/spi/BufferContextSnapshot.java
rename to tck/src/main/java/org/eclipse/microprofile/context/tck/contexts/buffer/spi/BufferContextSnapshot.java
index ef7b831..26827cc 100644
--- a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/contexts/buffer/spi/BufferContextSnapshot.java
+++ b/tck/src/main/java/org/eclipse/microprofile/context/tck/contexts/buffer/spi/BufferContextSnapshot.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ * Copyright (c) 2018,2019 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -16,9 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.microprofile.concurrency.tck.contexts.buffer.spi;
+package org.eclipse.microprofile.context.tck.contexts.buffer.spi;
 
-import org.eclipse.microprofile.concurrency.tck.contexts.buffer.Buffer;
+import org.eclipse.microprofile.context.tck.contexts.buffer.Buffer;
 import org.eclipse.microprofile.concurrent.spi.ThreadContextController;
 import org.eclipse.microprofile.concurrent.spi.ThreadContextSnapshot;
 
diff --git a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/contexts/label/Label.java b/tck/src/main/java/org/eclipse/microprofile/context/tck/contexts/label/Label.java
similarity index 91%
rename from tck/src/main/java/org/eclipse/microprofile/concurrency/tck/contexts/label/Label.java
rename to tck/src/main/java/org/eclipse/microprofile/context/tck/contexts/label/Label.java
index 7ed4298..c299967 100644
--- a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/contexts/label/Label.java
+++ b/tck/src/main/java/org/eclipse/microprofile/context/tck/contexts/label/Label.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ * Copyright (c) 2018,2019 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.microprofile.concurrency.tck.contexts.label;
+package org.eclipse.microprofile.context.tck.contexts.label;
 
 /**
  * This is a fake context type that is created by the test suite,
diff --git a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/contexts/label/spi/LabelContextProvider.java b/tck/src/main/java/org/eclipse/microprofile/context/tck/contexts/label/spi/LabelContextProvider.java
similarity index 92%
rename from tck/src/main/java/org/eclipse/microprofile/concurrency/tck/contexts/label/spi/LabelContextProvider.java
rename to tck/src/main/java/org/eclipse/microprofile/context/tck/contexts/label/spi/LabelContextProvider.java
index 3b18db1..cc0c0cc 100644
--- a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/contexts/label/spi/LabelContextProvider.java
+++ b/tck/src/main/java/org/eclipse/microprofile/context/tck/contexts/label/spi/LabelContextProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ * Copyright (c) 2018,2019 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -16,12 +16,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.microprofile.concurrency.tck.contexts.label.spi;
+package org.eclipse.microprofile.context.tck.contexts.label.spi;
 
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.eclipse.microprofile.concurrency.tck.contexts.label.Label;
+import org.eclipse.microprofile.context.tck.contexts.label.Label;
 import org.eclipse.microprofile.concurrent.spi.ThreadContextController;
 import org.eclipse.microprofile.concurrent.spi.ThreadContextProvider;
 import org.eclipse.microprofile.concurrent.spi.ThreadContextSnapshot;
diff --git a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/contexts/priority/spi/ThreadPriorityContextProvider.java b/tck/src/main/java/org/eclipse/microprofile/context/tck/contexts/priority/spi/ThreadPriorityContextProvider.java
similarity index 93%
rename from tck/src/main/java/org/eclipse/microprofile/concurrency/tck/contexts/priority/spi/ThreadPriorityContextProvider.java
rename to tck/src/main/java/org/eclipse/microprofile/context/tck/contexts/priority/spi/ThreadPriorityContextProvider.java
index e67f3c3..7efd19f 100644
--- a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/contexts/priority/spi/ThreadPriorityContextProvider.java
+++ b/tck/src/main/java/org/eclipse/microprofile/context/tck/contexts/priority/spi/ThreadPriorityContextProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ * Copyright (c) 2018,2019 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.microprofile.concurrency.tck.contexts.priority.spi;
+package org.eclipse.microprofile.context.tck.contexts.priority.spi;
 
 import java.util.Map;
 
diff --git a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/contexts/priority/spi/ThreadPrioritySnapshot.java b/tck/src/main/java/org/eclipse/microprofile/context/tck/contexts/priority/spi/ThreadPrioritySnapshot.java
similarity index 94%
rename from tck/src/main/java/org/eclipse/microprofile/concurrency/tck/contexts/priority/spi/ThreadPrioritySnapshot.java
rename to tck/src/main/java/org/eclipse/microprofile/context/tck/contexts/priority/spi/ThreadPrioritySnapshot.java
index c44a87a..01c843d 100644
--- a/tck/src/main/java/org/eclipse/microprofile/concurrency/tck/contexts/priority/spi/ThreadPrioritySnapshot.java
+++ b/tck/src/main/java/org/eclipse/microprofile/context/tck/contexts/priority/spi/ThreadPrioritySnapshot.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ * Copyright (c) 2018,2019 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.microprofile.concurrency.tck.contexts.priority.spi;
+package org.eclipse.microprofile.context.tck.contexts.priority.spi;
 
 import java.util.concurrent.atomic.AtomicBoolean;