diff --git a/jedi/evaluate/sys_path.py b/jedi/evaluate/sys_path.py
index 20d42fc4..170fa6fe 100644
--- a/jedi/evaluate/sys_path.py
+++ b/jedi/evaluate/sys_path.py
@@ -60,7 +60,7 @@ def _paths_from_assignment(evaluator, statement):
     for exp_list, operator in statement.assignment_details:
         if len(exp_list) != 1 or not isinstance(exp_list[0], pr.Call):
             continue
-        if unicode(exp_list[0].name) != 'sys.path':
+        if exp_list[0].names() != ['sys', 'path']:
             continue
         # TODO at this point we ignore all ways what could be assigned to
         # sys.path or an execution of it. Here we could do way more
diff --git a/test/test_parser/test_parser.py b/test/test_parser/test_parser.py
index 5916fe6e..ca509434 100644
--- a/test/test_parser/test_parser.py
+++ b/test/test_parser/test_parser.py
@@ -38,7 +38,7 @@ class TestCallAndName():
     def test_call_type(self):
         call = self.get_call('hello')
         assert isinstance(call, pr.Call)
-        assert type(call.name) == pr.Name
+        assert type(call.name) == pr.NamePart
 
     def test_literal_type(self):
         literal = self.get_call('1.0')
diff --git a/test/test_parser/test_tokenize.py b/test/test_parser/test_tokenize.py
index 04a9115f..ab57d4f1 100644
--- a/test/test_parser/test_tokenize.py
+++ b/test/test_parser/test_tokenize.py
@@ -26,4 +26,4 @@ asdfasdf""" + "h"
 def test_tokenizer_with_string_literal_backslash():
     import jedi
     c = jedi.Script("statement = u'foo\\\n'; statement").goto_definitions()
-    assert c[0]._name.parent.parent.obj == 'foo'
+    assert c[0]._name.parent.obj == 'foo'