diff --git a/setup.py b/setup.py
index 715998956..c3b91cfb9 100644
--- a/setup.py
+++ b/setup.py
@@ -163,7 +163,7 @@ def run_setup(exts):
                   'spacy.tests.munge',
                   'spacy.tests.parser',
                   'spacy.tests.serialize',
-                  'spacy.tests.spans',
+                  'spacy.tests.span',
                   'spacy.tests.tagger',
                   'spacy.tests.tokenizer',
                   'spacy.tests.tokens',
diff --git a/spacy/tokens/doc.pyx b/spacy/tokens/doc.pyx
index c1cef5789..b677b3385 100644
--- a/spacy/tokens/doc.pyx
+++ b/spacy/tokens/doc.pyx
@@ -18,7 +18,7 @@ from ..attrs cimport POS, LEMMA, TAG, DEP, HEAD, SPACY, ENT_IOB, ENT_TYPE
 from ..parts_of_speech cimport CONJ, PUNCT, NOUN
 from ..parts_of_speech cimport univ_pos_t
 from ..lexeme cimport Lexeme
-from .spans cimport Span
+from .span cimport Span
 from .token cimport Token
 from ..serialize.bits cimport BitArray
 from ..util import normalize_slice
diff --git a/spacy/tokens/spans.pxd b/spacy/tokens/span.pxd
similarity index 100%
rename from spacy/tokens/spans.pxd
rename to spacy/tokens/span.pxd
diff --git a/spacy/tokens/spans.pyx b/spacy/tokens/span.pyx
similarity index 100%
rename from spacy/tokens/spans.pyx
rename to spacy/tokens/span.pyx