diff --git a/src/main/QafooLabs/Refactoring/Adapters/TokenReflection/StaticCodeAnalysis.php b/src/main/QafooLabs/Refactoring/Adapters/TokenReflection/StaticCodeAnalysis.php
index c3521e0..950cb51 100644
--- a/src/main/QafooLabs/Refactoring/Adapters/TokenReflection/StaticCodeAnalysis.php
+++ b/src/main/QafooLabs/Refactoring/Adapters/TokenReflection/StaticCodeAnalysis.php
@@ -38,7 +38,7 @@ public function isMethodStatic(File $file, LineRange $range)
         $lastLine = $range->getEnd();
 
         foreach ($file->getNamespaces() as $namespace) {
-            foreach ($namespace->geTclasses() as $class) {
+            foreach ($namespace->getClasses() as $class) {
                 foreach ($class->getMethods() as $method) {
                     if ($method->getStartLine() < $lastLine && $lastLine < $method->getEndLine()) {
                         return $method->isStatic();
@@ -57,7 +57,7 @@ public function getMethodEndLine(File $file, LineRange $range)
         $lastLine = $range->getEnd();
 
         foreach ($file->getNamespaces() as $namespace) {
-            foreach ($namespace->geTclasses() as $class) {
+            foreach ($namespace->getClasses() as $class) {
                 foreach ($class->getMethods() as $method) {
                     if ($method->getStartLine() < $lastLine && $lastLine < $method->getEndLine()) {
                         return $method->getEndLine();
@@ -76,7 +76,7 @@ public function getMethodStartLine(File $file, LineRange $range)
         $lastLine = $range->getEnd();
 
         foreach ($file->getNamespaces() as $namespace) {
-            foreach ($namespace->geTclasses() as $class) {
+            foreach ($namespace->getClasses() as $class) {
                 foreach ($class->getMethods() as $method) {
                     if ($method->getStartLine() < $lastLine && $lastLine < $method->getEndLine()) {
                         return $method->getStartLine();
diff --git a/src/main/QafooLabs/Refactoring/Domain/Model/PhpClassName.php b/src/main/QafooLabs/Refactoring/Domain/Model/PhpClassName.php
index 8bf3db2..3806ea0 100644
--- a/src/main/QafooLabs/Refactoring/Domain/Model/PhpClassName.php
+++ b/src/main/QafooLabs/Refactoring/Domain/Model/PhpClassName.php
@@ -3,7 +3,7 @@
 namespace QafooLabs\Refactoring\Domain\Model;
 
 /**
- * Abstraction fo php class names based on a file.
+ * Abstraction for php class names based on a file.
  */
 class PhpClassName
 {
@@ -16,7 +16,7 @@ public function __construct(File $file)
 
     public function getNamespace()
     {
-        $parts = explode("/", $this->file->getRelativePath());
+        $parts = explode(DIRECTORY_SEPARATOR, ltrim($this->file->getRelativePath(), DIRECTORY_SEPARATOR));
         $namespace = array();
 
         foreach ($parts as $part) {
diff --git a/src/test/QafooLabs/Refactoring/Domain/Model/PhpClassNameTest.php b/src/test/QafooLabs/Refactoring/Domain/Model/PhpClassNameTest.php
index 14ebb5d..3c82255 100644
--- a/src/test/QafooLabs/Refactoring/Domain/Model/PhpClassNameTest.php
+++ b/src/test/QafooLabs/Refactoring/Domain/Model/PhpClassNameTest.php
@@ -10,5 +10,6 @@ public function testNames()
 
         $this->assertEquals("PhpClassNameTest", $className->getShortname());
         $this->assertEquals("QafooLabs\Refactoring\Domain\Model", $className->getNamespace());
+        $this->assertEquals("QafooLabs\Refactoring\Domain\Model\PhpClassNameTest", $className->getName());
     }
 }