diff --git a/packages/datafile-manager/CHANGELOG.md b/packages/datafile-manager/CHANGELOG.md
index 89d39a97d..587a08686 100644
--- a/packages/datafile-manager/CHANGELOG.md
+++ b/packages/datafile-manager/CHANGELOG.md
@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [Unreleased]
 Changes that have landed but are not yet released.
 
+### Changed
+- Changed name of top-level exports in index.node.ts and index.browser.ts from DatafileManager to HttpPollingDatafileManager, to avoid name conflict with DatafileManager interface
+
 ## [0.3.0] - May 13, 2019
 
 ### New Features
diff --git a/packages/datafile-manager/__test__/httpPollingDatafileManager.spec.ts b/packages/datafile-manager/__test__/httpPollingDatafileManager.spec.ts
index 669bb5c78..8a1af3d6d 100644
--- a/packages/datafile-manager/__test__/httpPollingDatafileManager.spec.ts
+++ b/packages/datafile-manager/__test__/httpPollingDatafileManager.spec.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import HTTPPollingDatafileManager from '../src/httpPollingDatafileManager'
+import HttpPollingDatafileManager from '../src/httpPollingDatafileManager'
 import { Headers, AbortableRequest, Response } from '../src/http'
 import { DatafileManagerConfig } from '../src/datafileManager';
 import { advanceTimersByTime, getTimerCount } from './testUtils'
@@ -34,7 +34,7 @@ import BackoffController from '../src/backoffController'
 
 // Test implementation:
 //   - Does not make any real requests: just resolves with queued responses (tests push onto queuedResponses)
-class TestDatafileManager extends HTTPPollingDatafileManager {
+class TestDatafileManager extends HttpPollingDatafileManager {
   queuedResponses: (Response | Error)[] = []
 
   responsePromises: Promise<Response>[] = []
diff --git a/packages/datafile-manager/src/httpPollingDatafileManager.ts b/packages/datafile-manager/src/httpPollingDatafileManager.ts
index 79420f903..6f9784699 100644
--- a/packages/datafile-manager/src/httpPollingDatafileManager.ts
+++ b/packages/datafile-manager/src/httpPollingDatafileManager.ts
@@ -34,7 +34,7 @@ function isSuccessStatusCode(statusCode: number): boolean {
   return statusCode >= 200 && statusCode < 400
 }
 
-export default abstract class HTTPPollingDatafileManager implements DatafileManager {
+export default abstract class HttpPollingDatafileManager implements DatafileManager {
   // Make an HTTP get request to the given URL with the given headers
   // Return an AbortableRequest, which has a promise for a Response.
   // If we can't get a response, the promise is rejected.
@@ -208,7 +208,7 @@ export default abstract class HTTPPollingDatafileManager implements DatafileMana
     }
   }
 
-  private onRequestComplete(this: HTTPPollingDatafileManager): void {
+  private onRequestComplete(this: HttpPollingDatafileManager): void {
     if (!this.isStarted) {
       return
     }
diff --git a/packages/datafile-manager/src/index.browser.ts b/packages/datafile-manager/src/index.browser.ts
index f83d01a9b..100f3b85c 100644
--- a/packages/datafile-manager/src/index.browser.ts
+++ b/packages/datafile-manager/src/index.browser.ts
@@ -15,5 +15,5 @@
  */
 
 export * from './datafileManager'
-export { default as DatafileManager } from './browserDatafileManager'
+export { default as HttpPollingDatafileManager } from './browserDatafileManager'
 export { default as StaticDatafileManager } from './staticDatafileManager';
diff --git a/packages/datafile-manager/src/index.node.ts b/packages/datafile-manager/src/index.node.ts
index e53dbbd18..6535dce6c 100644
--- a/packages/datafile-manager/src/index.node.ts
+++ b/packages/datafile-manager/src/index.node.ts
@@ -15,5 +15,5 @@
  */
 
 export * from './datafileManager'
-export { default as DatafileManager } from './nodeDatafileManager'
+export { default as HttpPollingDatafileManager } from './nodeDatafileManager'
 export { default as StaticDatafileManager } from './staticDatafileManager';