diff --git a/dvc/cmd_base.py b/dvc/cmd_base.py
index 50bc6c3e4..80ed1c7f4 100644
--- a/dvc/cmd_base.py
+++ b/dvc/cmd_base.py
@@ -4,7 +4,7 @@ import os
 from dvc.git_wrapper import GitWrapper
 from dvc.config import Config, ConfigError
 from dvc.logger import Logger
-from dvc.path.path_factory import PathFactory
+from dvc.path.factory import PathFactory
 from dvc.utils import cached_property
 
 
diff --git a/dvc/cmd_repro.py b/dvc/cmd_repro.py
index 118584b3b..11cd580a9 100644
--- a/dvc/cmd_repro.py
+++ b/dvc/cmd_repro.py
@@ -6,7 +6,7 @@ from dvc.cmd_base import CmdBase
 from dvc.cmd_run import CmdRun
 from dvc.logger import Logger
 from dvc.exceptions import DvcException
-from dvc.path.data_path import NotInDataDirError
+from dvc.path.data_item import NotInDataDirError
 from dvc.state_file import StateFile
 from dvc.utils import run
 
diff --git a/dvc/cmd_run.py b/dvc/cmd_run.py
index 283036022..13c9032d8 100644
--- a/dvc/cmd_run.py
+++ b/dvc/cmd_run.py
@@ -2,7 +2,7 @@ import os
 import shutil
 import fasteners
 
-from dvc.path.data_path import NotInDataDirError
+from dvc.path.data_item import NotInDataDirError
 from dvc.git_wrapper import GitWrapper
 from dvc.cmd_base import CmdBase
 from dvc.logger import Logger
diff --git a/dvc/git_wrapper.py b/dvc/git_wrapper.py
index df95e5784..70b75aa5a 100644
--- a/dvc/git_wrapper.py
+++ b/dvc/git_wrapper.py
@@ -2,7 +2,6 @@ import os
 import sys
 import subprocess
 
-from dvc.path.dvc_path import DvcPath
 from dvc.exceptions import DvcException
 from dvc.logger import Logger
 from dvc.config import Config
diff --git a/dvc/path/data_path.py b/dvc/path/data_item.py
similarity index 98%
rename from dvc/path/data_path.py
rename to dvc/path/data_item.py
index 088257eed..a9710ad2a 100644
--- a/dvc/path/data_path.py
+++ b/dvc/path/data_item.py
@@ -1,6 +1,6 @@
 import os
 
-from dvc.path.dvc_path import DvcPath
+from dvc.path.path import DvcPath
 from dvc.exceptions import DvcException
 from dvc.utils import cached_property
 
diff --git a/dvc/path/path_factory.py b/dvc/path/factory.py
similarity index 91%
rename from dvc/path/path_factory.py
rename to dvc/path/factory.py
index 4aa714f43..5398f728f 100644
--- a/dvc/path/path_factory.py
+++ b/dvc/path/factory.py
@@ -1,7 +1,7 @@
 import os
 
-from dvc.path.data_path import DataPath, DataFilePathError, NotInDataDirError
-from dvc.path.dvc_path import DvcPath
+from dvc.path.data_item import DataPath, DataFilePathError, NotInDataDirError
+from dvc.path.path import DvcPath
 
 
 class PathFactory(object):
diff --git a/dvc/path/dvc_path.py b/dvc/path/path.py
similarity index 100%
rename from dvc/path/dvc_path.py
rename to dvc/path/path.py
diff --git a/tests/basic_env.py b/tests/basic_env.py
index ce58f8af5..3ef8c51ec 100644
--- a/tests/basic_env.py
+++ b/tests/basic_env.py
@@ -4,8 +4,8 @@ from unittest import TestCase
 
 from dvc.config import ConfigI
 from dvc.git_wrapper import GitWrapperI, GitWrapper
-from dvc.path.data_path import DataPath
-from dvc.path.path_factory import PathFactory
+from dvc.path.data_item import DataPath
+from dvc.path.factory import PathFactory
 
 
 class BasicEnvironment(TestCase):
diff --git a/tests/test_cmd_data_remove.py b/tests/test_cmd_data_remove.py
index 46c529ea2..75ae87b63 100644
--- a/tests/test_cmd_data_remove.py
+++ b/tests/test_cmd_data_remove.py
@@ -1,7 +1,7 @@
 import os
 
 from dvc.cmd_data_remove import CmdDataRemove, DataRemoveError
-from dvc.path.data_path import DataFilePathError
+from dvc.path.data_item import DataFilePathError
 from tests.basic_env import DirHierarchyEnvironment
 
 
diff --git a/tests/test_data_file_obj.py b/tests/test_data_file_obj.py
index 546aaa79b..573b8c427 100644
--- a/tests/test_data_file_obj.py
+++ b/tests/test_data_file_obj.py
@@ -2,8 +2,8 @@ import os
 
 from dvc.config import ConfigI
 from dvc.git_wrapper import GitWrapperI
-from dvc.path.data_path import NotInDataDirError, DataFilePathError, DataPath
-from dvc.path.path_factory import PathFactory
+from dvc.path.data_item import NotInDataDirError, DataFilePathError, DataPath
+from dvc.path.factory import PathFactory
 from tests.basic_env import BasicEnvironment
 
 
diff --git a/tests/test_dvc_path.py b/tests/test_dvc_path.py
index 2d5d7c3ed..b408d9766 100644
--- a/tests/test_dvc_path.py
+++ b/tests/test_dvc_path.py
@@ -2,7 +2,7 @@ import os
 import shutil
 from unittest import TestCase
 
-from dvc.path.dvc_path import DvcPath
+from dvc.path.path import DvcPath
 from dvc.git_wrapper import GitWrapperI