diff --git a/libraries/model-baker/src/model-baker/Baker.cpp b/libraries/model-baker/src/model-baker/Baker.cpp
index b1ae5653f4..50b635583b 100644
--- a/libraries/model-baker/src/model-baker/Baker.cpp
+++ b/libraries/model-baker/src/model-baker/Baker.cpp
@@ -26,7 +26,7 @@ namespace baker {
     };
 
     Baker::Baker(const hfm::Model::Pointer& hfmModel) :
-        _engine(std::make_shared<Engine>(BakerEngineBuilder::JobModel::create("Baker"), std::make_shared<ImportContext>())) {
+        _engine(std::make_shared<Engine>(BakerEngineBuilder::JobModel::create("Baker"), std::make_shared<BakeContext>())) {
         _engine->feedInput<BakerEngineBuilder::Input>(0, hfmModel);
     }
 
diff --git a/libraries/model-baker/src/model-baker/Engine.h b/libraries/model-baker/src/model-baker/Engine.h
index 42cad4e99f..4f450e2b2b 100644
--- a/libraries/model-baker/src/model-baker/Engine.h
+++ b/libraries/model-baker/src/model-baker/Engine.h
@@ -16,14 +16,14 @@
 
 namespace baker {
 
-    class ImportContext : public task::JobContext {
+    class BakeContext : public task::JobContext {
     public:
         // No context settings yet for model prep
     };
-    using ImportContextPointer = std::shared_ptr<ImportContext>;
+    using BakeContextPointer = std::shared_ptr<BakeContext>;
 
     Task_DeclareCategoryTimeProfilerClass(BakerTimeProfiler, trace_baker);
-    Task_DeclareTypeAliases(ImportContext, BakerTimeProfiler)
+    Task_DeclareTypeAliases(BakeContext, BakerTimeProfiler)
 
     using EnginePointer = std::shared_ptr<Engine>;