diff --git a/platform/ui/index.js b/platform/ui/index.js
index 432fa5b22..b2ab9db71 100644
--- a/platform/ui/index.js
+++ b/platform/ui/index.js
@@ -4,7 +4,7 @@ export { utils };
 
 /** CONTEXT/HOOKS */
 export {
-  DragAndDropContext,
+  DragAndDropProvider,
   ModalProvider,
   ModalConsumer,
   useModal,
diff --git a/platform/ui/src/contextProviders/DragAndDropContext.js b/platform/ui/src/contextProviders/DragAndDropProvider.jsx
similarity index 92%
rename from platform/ui/src/contextProviders/DragAndDropContext.js
rename to platform/ui/src/contextProviders/DragAndDropProvider.jsx
index 75bc48351..4cd4e360e 100644
--- a/platform/ui/src/contextProviders/DragAndDropContext.js
+++ b/platform/ui/src/contextProviders/DragAndDropProvider.jsx
@@ -13,7 +13,7 @@ const isTouchDevice = typeof window !== `undefined` && !!('ontouchstart' in wind
  * Docs:
  * http://react-dnd.github.io/react-dnd/docs/api/drag-drop-context
  */
-export default function DragAndDropContext({children}) {
+export default function DragAndDropProvider({children}) {
   const backend = isTouchDevice ? TouchBackend : HTML5Backend;
   const opts = isTouchDevice ? { enableMouseEvents: true } : {};
 
diff --git a/platform/ui/src/contextProviders/index.js b/platform/ui/src/contextProviders/index.js
index ebe36349c..8c5abfbc0 100644
--- a/platform/ui/src/contextProviders/index.js
+++ b/platform/ui/src/contextProviders/index.js
@@ -10,4 +10,4 @@ export {
   useViewportDialog,
 } from './ViewportDialogProvider';
 
-export { default as DragAndDropContext } from './DragAndDropContext';
+export { default as DragAndDropProvider } from './DragAndDropProvider';