diff --git a/spacy/wsd/supersense_tagger.pyx b/spacy/wsd/supersense_tagger.pyx
index dc4644b98..d9daa3424 100644
--- a/spacy/wsd/supersense_tagger.pyx
+++ b/spacy/wsd/supersense_tagger.pyx
@@ -10,22 +10,21 @@ from thinc.typedefs cimport atom_t, weight_t, feat_t
 cimport cython
 
 
-from .typedefs cimport flags_t
-from .structs cimport TokenC
-from .strings cimport StringStore
-from .tokens cimport Tokens
-from .senses cimport N_SENSES, encode_sense_strs
-from .senses cimport NO_SENSE, N_Tops, J_all, J_pert, A_all, J_ppl, V_body
-from .gold cimport GoldParse
-from .parts_of_speech cimport NOUN, VERB, ADV, ADJ, N_UNIV_TAGS
+from ..typedefs cimport flags_t
+from ..structs cimport TokenC
+from ..strings cimport StringStore
+from ..tokens cimport Tokens
+from .supersenses cimport N_SENSES, encode_supersense_strs
+from .supersenses cimport NO_SENSE, N_Tops, J_all, J_pert, A_all, J_ppl, V_body
+from ..gold cimport GoldParse
+from ..parts_of_speech cimport NOUN, VERB, ADV, ADJ, N_UNIV_TAGS
 
-from . cimport parts_of_speech
+from .. cimport parts_of_speech
 
 from os import path
 import json
 
 
-
 cdef enum:
     P2W
     P2p
diff --git a/spacy/wsd/supersenses.pxd b/spacy/wsd/supersenses.pxd
index d6e73dbc3..bc85752a5 100644
--- a/spacy/wsd/supersenses.pxd
+++ b/spacy/wsd/supersenses.pxd
@@ -1,6 +1,6 @@
 # Enum of Wordnet supersenses
-cimport parts_of_speech
-from .typedefs cimport flags_t
+from ..typedefs cimport flags_t
+from .. cimport parts_of_speech
 
 cpdef enum:
     NO_SENSE
@@ -52,4 +52,4 @@ cpdef enum:
     N_SENSES
 
 
-cdef flags_t encode_sense_strs(sense_names) except 0
+cdef flags_t encode_supersense_strs(sense_names) except 0
diff --git a/spacy/wsd/supersenses.pyx b/spacy/wsd/supersenses.pyx
index c029dd49d..ee988b999 100644
--- a/spacy/wsd/supersenses.pyx
+++ b/spacy/wsd/supersenses.pyx
@@ -1,5 +1,5 @@
 from __future__ import unicode_literals
-cimport parts_of_speech
+from .. cimport parts_of_speech
 
 
 lexnames_str = """
@@ -56,7 +56,7 @@ STRINGS = tuple(line.split()[1] for line in lexnames_str.split('\n'))
 IDS = dict((sense_str, i) for i, sense_str in enumerate(STRINGS))
 
 
-cdef flags_t encode_sense_strs(sense_names) except 0:
+cdef flags_t encode_supersense_strs(sense_names) except 0:
     cdef flags_t sense_bits = 0
     if len(sense_names) == 0:
         return sense_bits | (1 << NO_SENSE)