diff --git a/setup.py b/setup.py
index f193d0498..b1b3785eb 100755
--- a/setup.py
+++ b/setup.py
@@ -56,6 +56,7 @@ MOD_NAMES = [
     "spacy.tokens.doc",
     "spacy.tokens.span",
     "spacy.tokens.token",
+    "spacy.tokens.morphanalysis",
     "spacy.tokens._retokenize",
     "spacy.matcher.matcher",
     "spacy.matcher.phrasematcher",
diff --git a/spacy/tokens/morphanalysis.pyx b/spacy/tokens/morphanalysis.pyx
index 722f97994..01ecf458b 100644
--- a/spacy/tokens/morphanalysis.pyx
+++ b/spacy/tokens/morphanalysis.pyx
@@ -2,7 +2,7 @@ from ..vocab cimport Vocab
 from ..typedefs cimport hash_t
 
 
-cdef class Morphanalysis:
+cdef class MorphAnalysis:
     """Control access to morphological features for a token."""
     def __init__(self, Vocab vocab, features=tuple()):
         self.vocab = vocab
@@ -118,14 +118,6 @@ cdef class Morphanalysis:
         def __get__(self):
             pass
 
-    property name_type:
-        def __get__(self):
-            pass
-
-    property negative:
-        def __get__(self):
-            pass
-
     property mood:
         def __get__(self):
             pass
@@ -138,6 +130,10 @@ cdef class Morphanalysis:
         def __get__(self):
             pass
 
+    property noun_type:
+        def __get__(self):
+            pass
+
     property number:
         def __get__(self):
             pass
@@ -306,14 +302,6 @@ cdef class Morphanalysis:
         def __get__(self):
             pass
     
-    property name_type_:
-        def __get__(self):
-            pass
-
-    property negative_:
-        def __get__(self):
-            pass
-
     property number_:
         def __get__(self):
             pass