diff --git a/media/libheadtracking/HeadTrackingProcessor-test.cpp b/media/libheadtracking/HeadTrackingProcessor-test.cpp
index 755f415..ae5567d 100644
--- a/media/libheadtracking/HeadTrackingProcessor-test.cpp
+++ b/media/libheadtracking/HeadTrackingProcessor-test.cpp
@@ -33,7 +33,7 @@
     for (auto mode : {HeadTrackingMode::STATIC, HeadTrackingMode::WORLD_RELATIVE,
                       HeadTrackingMode::SCREEN_RELATIVE}) {
         std::unique_ptr<HeadTrackingProcessor> processor =
-                createHeadTrackingProcess(Options{}, mode);
+                createHeadTrackingProcessor(Options{}, mode);
         processor->calculate(0);
         EXPECT_EQ(processor->getActualMode(), HeadTrackingMode::STATIC);
         EXPECT_EQ(processor->getHeadToStagePose(), Pose3f());
@@ -47,7 +47,7 @@
     const float physicalToLogical = M_PI_2;
 
     std::unique_ptr<HeadTrackingProcessor> processor =
-            createHeadTrackingProcess(Options{}, HeadTrackingMode::SCREEN_RELATIVE);
+            createHeadTrackingProcessor(Options{}, HeadTrackingMode::SCREEN_RELATIVE);
     processor->setWorldToHeadPose(0, worldToHead, Twist3f());
     processor->setWorldToScreenPose(0, worldToScreen);
     processor->setScreenToStagePose(screenToStage);
@@ -74,7 +74,7 @@
     const Twist3f headTwist{{4, 5, 6}, quaternionToRotationVector(Quaternionf::UnitRandom()) / 10};
     const Pose3f worldToScreen{{4, 5, 6}, Quaternionf::UnitRandom()};
 
-    std::unique_ptr<HeadTrackingProcessor> processor = createHeadTrackingProcess(
+    std::unique_ptr<HeadTrackingProcessor> processor = createHeadTrackingProcessor(
             Options{.predictionDuration = 2.f}, HeadTrackingMode::WORLD_RELATIVE);
     processor->setWorldToHeadPose(0, worldToHead, headTwist);
     processor->setWorldToScreenPose(0, worldToScreen);
@@ -97,7 +97,7 @@
 TEST(HeadTrackingProcessor, SmoothModeSwitch) {
     const Pose3f targetHeadToWorld = Pose3f({4, 0, 0}, rotateZ(M_PI / 2));
 
-    std::unique_ptr<HeadTrackingProcessor> processor = createHeadTrackingProcess(
+    std::unique_ptr<HeadTrackingProcessor> processor = createHeadTrackingProcessor(
             Options{.maxTranslationalVelocity = 1}, HeadTrackingMode::STATIC);
 
     processor->calculate(0);
diff --git a/media/libheadtracking/HeadTrackingProcessor.cpp b/media/libheadtracking/HeadTrackingProcessor.cpp
index fe91419..ee60fa5 100644
--- a/media/libheadtracking/HeadTrackingProcessor.cpp
+++ b/media/libheadtracking/HeadTrackingProcessor.cpp
@@ -129,7 +129,7 @@
 
 }  // namespace
 
-std::unique_ptr<HeadTrackingProcessor> createHeadTrackingProcess(
+std::unique_ptr<HeadTrackingProcessor> createHeadTrackingProcessor(
         const HeadTrackingProcessor::Options& options, HeadTrackingMode initialMode) {
     return std::make_unique<HeadTrackingProcessorImpl>(options, initialMode);
 }
diff --git a/media/libheadtracking/include/media/HeadTrackingProcessor.h b/media/libheadtracking/include/media/HeadTrackingProcessor.h
index e9ce8a2..23de540 100644
--- a/media/libheadtracking/include/media/HeadTrackingProcessor.h
+++ b/media/libheadtracking/include/media/HeadTrackingProcessor.h
@@ -97,7 +97,7 @@
 /**
  * Creates an instance featuring a default implementation of the HeadTrackingProcessor interface.
  */
-std::unique_ptr<HeadTrackingProcessor> createHeadTrackingProcess(
+std::unique_ptr<HeadTrackingProcessor> createHeadTrackingProcessor(
         const HeadTrackingProcessor::Options& options,
         HeadTrackingMode initialMode = HeadTrackingMode::STATIC);
 
