diff --git a/README.md b/README.md
index 4ab6a9ee..c31ef441 100644
--- a/README.md
+++ b/README.md
@@ -103,6 +103,12 @@ main();
 
 Because the npm installer and node module resolution algorithm could potentially allow two or more copies of any given package to exist within the same `node_modules` structure, the OpenTelemetry API takes advantage of a variable on the `global` object to store the global API. When an API method in the API package is called, it checks if this `global` API exists and proxies calls to it if and only if it is a compatible API version. This means if a package has a dependency on an OpenTelemetry API version which is not compatible with the API used by the end user, the package will receive a no-op implementation of the API.
 
+## Upgrade guidelines
+
+### 1.0.0-rc.0 to x
+
+- `HttpBaggage` renamed to `HttpBaggagePropagator`
+
 ## Useful links
 
 - For more information on OpenTelemetry, visit: <https://opentelemetry.io/>
diff --git a/src/context/context.ts b/src/context/context.ts
index 6e59831b..5862ec0d 100644
--- a/src/context/context.ts
+++ b/src/context/context.ts
@@ -16,7 +16,7 @@
 
 import { Context } from './types';
 import { Baggage, Span, SpanContext } from '../';
-import { NoopSpan } from '../trace/NoopSpan';
+import { NonRecordingSpan } from '../trace/NonRecordingSpan';
 
 /**
  * span key
@@ -56,7 +56,7 @@ export function setSpan(context: Context, span: Span): Context {
 }
 
 /**
- * Wrap span context in a NoopSpan and set as span in a new
+ * Wrap span context in a NonRecordingSpan and set as span in a new
  * context
  *
  * @param context context to set active span on
@@ -66,7 +66,7 @@ export function setSpanContext(
   context: Context,
   spanContext: SpanContext
 ): Context {
-  return setSpan(context, new NoopSpan(spanContext));
+  return setSpan(context, new NonRecordingSpan(spanContext));
 }
 
 /**
diff --git a/src/trace/NoopSpan.ts b/src/trace/NonRecordingSpan.ts
similarity index 91%
rename from src/trace/NoopSpan.ts
rename to src/trace/NonRecordingSpan.ts
index 40f238d3..a6bfa534 100644
--- a/src/trace/NoopSpan.ts
+++ b/src/trace/NonRecordingSpan.ts
@@ -23,11 +23,11 @@ import { SpanStatus } from './status';
 import { INVALID_SPAN_CONTEXT } from './spancontext-utils';
 
 /**
- * The NoopSpan is the default {@link Span} that is used when no Span
+ * The NonRecordingSpan is the default {@link Span} that is used when no Span
  * implementation is available. All operations are no-op including context
  * propagation.
  */
-export class NoopSpan implements Span {
+export class NonRecordingSpan implements Span {
   constructor(
     private readonly _spanContext: SpanContext = INVALID_SPAN_CONTEXT
   ) {}
@@ -65,7 +65,7 @@ export class NoopSpan implements Span {
   // By default does nothing
   end(_endTime?: TimeInput): void {}
 
-  // isRecording always returns false for noopSpan.
+  // isRecording always returns false for NonRecordingSpan.
   isRecording(): boolean {
     return false;
   }
diff --git a/src/trace/NoopTracer.ts b/src/trace/NoopTracer.ts
index 556b1d70..1fbaf869 100644
--- a/src/trace/NoopTracer.ts
+++ b/src/trace/NoopTracer.ts
@@ -16,7 +16,7 @@
 
 import { getSpanContext } from '../context/context';
 import { Context } from '../context/types';
-import { NoopSpan } from './NoopSpan';
+import { NonRecordingSpan } from './NonRecordingSpan';
 import { Span } from './span';
 import { isSpanContextValid } from './spancontext-utils';
 import { SpanOptions } from './SpanOptions';
@@ -31,7 +31,7 @@ export class NoopTracer implements Tracer {
   startSpan(name: string, options?: SpanOptions, context?: Context): Span {
     const root = Boolean(options?.root);
     if (root) {
-      return new NoopSpan();
+      return new NonRecordingSpan();
     }
 
     const parentFromContext = context && getSpanContext(context);
@@ -40,9 +40,9 @@ export class NoopTracer implements Tracer {
       isSpanContext(parentFromContext) &&
       isSpanContextValid(parentFromContext)
     ) {
-      return new NoopSpan(parentFromContext);
+      return new NonRecordingSpan(parentFromContext);
     } else {
-      return new NoopSpan();
+      return new NonRecordingSpan();
     }
   }
 }
diff --git a/test/api/api.test.ts b/test/api/api.test.ts
index 4fcad808..8049f25f 100644
--- a/test/api/api.test.ts
+++ b/test/api/api.test.ts
@@ -34,7 +34,7 @@ import api, {
   diag,
 } from '../../src';
 import { DiagAPI } from '../../src/api/diag';
-import { NoopSpan } from '../../src/trace/NoopSpan';
+import { NonRecordingSpan } from '../../src/trace/NonRecordingSpan';
 
 // DiagLogger implementation
 const diagLoggerFunctions = [
@@ -78,7 +78,7 @@ describe('API', () => {
       spanId: '6e0c63257de34c92',
       traceFlags: TraceFlags.NONE,
     };
-    const dummySpan = new NoopSpan(spanContext);
+    const dummySpan = new NonRecordingSpan(spanContext);
 
     beforeEach(() => {
       context.disable();
diff --git a/test/noop-implementations/noop-span.test.ts b/test/noop-implementations/noop-span.test.ts
index d2974fca..11f056b1 100644
--- a/test/noop-implementations/noop-span.test.ts
+++ b/test/noop-implementations/noop-span.test.ts
@@ -21,11 +21,11 @@ import {
   INVALID_TRACEID,
   TraceFlags,
 } from '../../src';
-import { NoopSpan } from '../../src/trace/NoopSpan';
+import { NonRecordingSpan } from '../../src/trace/NonRecordingSpan';
 
-describe('NoopSpan', () => {
+describe('NonRecordingSpan', () => {
   it('do not crash', () => {
-    const span = new NoopSpan();
+    const span = new NonRecordingSpan();
     span.setAttribute('my_string_attribute', 'foo');
     span.setAttribute('my_number_attribute', 123);
     span.setAttribute('my_boolean_attribute', false);
diff --git a/test/noop-implementations/noop-tracer.test.ts b/test/noop-implementations/noop-tracer.test.ts
index 661ff34d..af425e72 100644
--- a/test/noop-implementations/noop-tracer.test.ts
+++ b/test/noop-implementations/noop-tracer.test.ts
@@ -23,20 +23,20 @@ import {
   context,
   setSpanContext,
 } from '../../src';
-import { NoopSpan } from '../../src/trace/NoopSpan';
+import { NonRecordingSpan } from '../../src/trace/NonRecordingSpan';
 
 describe('NoopTracer', () => {
   it('should not crash', () => {
     const tracer = new NoopTracer();
 
-    assert.ok(tracer.startSpan('span-name') instanceof NoopSpan);
+    assert.ok(tracer.startSpan('span-name') instanceof NonRecordingSpan);
     assert.ok(
       tracer.startSpan('span-name1', { kind: SpanKind.CLIENT }) instanceof
-        NoopSpan
+        NonRecordingSpan
     );
     assert.ok(
       tracer.startSpan('span-name2', { kind: SpanKind.CLIENT }) instanceof
-        NoopSpan
+        NonRecordingSpan
     );
   });
 
diff --git a/test/proxy-implementations/proxy-tracer.test.ts b/test/proxy-implementations/proxy-tracer.test.ts
index c6e2756c..c350913a 100644
--- a/test/proxy-implementations/proxy-tracer.test.ts
+++ b/test/proxy-implementations/proxy-tracer.test.ts
@@ -27,7 +27,7 @@ import {
   ROOT_CONTEXT,
   SpanOptions,
 } from '../../src';
-import { NoopSpan } from '../../src/trace/NoopSpan';
+import { NonRecordingSpan } from '../../src/trace/NonRecordingSpan';
 
 describe('ProxyTracer', () => {
   let provider: ProxyTracerProvider;
@@ -51,14 +51,14 @@ describe('ProxyTracer', () => {
     it('startSpan should return Noop Spans', () => {
       const tracer = provider.getTracer('test');
 
-      assert.ok(tracer.startSpan('span-name') instanceof NoopSpan);
+      assert.ok(tracer.startSpan('span-name') instanceof NonRecordingSpan);
       assert.ok(
         tracer.startSpan('span-name1', { kind: SpanKind.CLIENT }) instanceof
-          NoopSpan
+          NonRecordingSpan
       );
       assert.ok(
         tracer.startSpan('span-name2', { kind: SpanKind.CLIENT }) instanceof
-          NoopSpan
+          NonRecordingSpan
       );
     });
   });
@@ -91,7 +91,7 @@ describe('ProxyTracer', () => {
     let delegateTracer: Tracer;
 
     beforeEach(() => {
-      delegateSpan = new NoopSpan();
+      delegateSpan = new NonRecordingSpan();
       delegateTracer = {
         startSpan() {
           return delegateSpan;