diff --git a/src/SilverStripe/BehatExtension/Context/FixtureContext.php b/src/SilverStripe/BehatExtension/Context/FixtureContext.php
index 267a3e6..a4d0a06 100644
--- a/src/SilverStripe/BehatExtension/Context/FixtureContext.php
+++ b/src/SilverStripe/BehatExtension/Context/FixtureContext.php
@@ -459,7 +459,7 @@ class FixtureContext extends BehatContext
         $type = trim($type);
 
         // Try direct mapping
-        $class = str_replace(' ', '', ucfirst($type));
+        $class = str_replace(' ', '', ucwords($type));
         if(class_exists($class) || !($class == 'DataObject' || is_subclass_of($class, 'DataObject'))) {
             return $class;
         }