diff --git a/dvc/project.py b/dvc/project.py
index a3398680a..c9242551f 100644
--- a/dvc/project.py
+++ b/dvc/project.py
@@ -261,48 +261,60 @@ class Project(object):
         return stage
 
     def move(self, from_path, to_path):
+        """
+        Renames an output file and modifies the stage associated
+        to reflect the change on the pipeline.
+
+        If the output has the same name as its stage, it would
+        also rename the corresponding stage file.
+
+        E.g.
+              Having: (hello, hello.dvc)
+
+              $ dvc move hello greetings
+
+              Result: (greeting, greeting.dvc)
+
+        It only works with outputs generated by `add` or `import`,
+        also known as data sources.
+        """
         import dvc.output as Output
         from dvc.stage import Stage
 
         from_out = Output.loads_from(Stage(self, cwd=os.curdir),
                                      [from_path])[0]
 
-        found = False
-        self._files_to_git_add = []
-        with self.state:
-            for stage in self.stages():
-                for out in stage.outs:
-                    if out.path != from_out.path:
-                        continue
+        try:
+            stage, out = next((stage, out)
+                              for stage in self.stages()
+                              for out in stage.outs
+                              if from_out.path == out.path)
+        except StopIteration:
+            raise DvcException("unable to find stage file with output '{path}'"
+                               .format(path=from_path))
 
-                    if not stage.is_data_source:
-                        raise MoveNotDataSourceError(stage.relpath)
+        if not stage.is_data_source:
+            raise MoveNotDataSourceError(stage.relpath)
 
-                    found = True
-                    to_out = Output.loads_from(out.stage,
-                                               [to_path],
-                                               out.cache,
-                                               out.metric)[0]
-                    out.move(to_out)
+        to_out = Output.loads_from(stage, [to_path], out.cache, out.metric)[0]
 
-                    stage_base = os.path.basename(stage.path)
-                    stage_base = stage_base.rstrip(Stage.STAGE_FILE_SUFFIX)
+        with self.state:
+            out.move(to_out)
 
-                    stage_dir = os.path.dirname(stage.path)
-                    from_base = os.path.basename(from_path)
-                    to_base = os.path.basename(to_path)
-                    if stage_base == from_base:
-                        os.unlink(stage.path)
-                        path = to_base + Stage.STAGE_FILE_SUFFIX
-                        stage.path = os.path.join(stage_dir, path)
+        stage_name = os.path.splitext(os.path.basename(stage.path))[0]
+        from_name = os.path.basename(from_out.path)
 
-                stage.dump()
+        if stage_name == from_name:
+            os.unlink(stage.path)
 
-        self._remind_to_git_add()
+            stage.path = os.path.join(
+                os.path.dirname(stage.path),
+                os.path.basename(to_path) + Stage.STAGE_FILE_SUFFIX
+            )
+
+        stage.dump()
 
-        if not found:
-            msg = "unable to find dvcfile with output '{}'"
-            raise DvcException(msg.format(from_path))
+        self._remind_to_git_add()
 
     def _unprotect_file(self, path):
         import stat

move: stage file doesn't change when data has a suffix in the filename
```
echo foo > foo
dvc add foo
dvc move foo bar
# removes foo.dvc and creates bar.dvc

echo foo > foo.csv
dvc add foo.csv
dvc move foo.csv bar.csv
# doesn't create bar.csv.dvc and leaves foo.csv.dvc
```
diff --git a/tests/test_move.py b/tests/test_move.py
index 9e719691b..ab43f623e 100644
--- a/tests/test_move.py
+++ b/tests/test_move.py
@@ -57,3 +57,22 @@ class TestMoveNotDataSource(TestRepro):
 
         ret = main(['move', self.file1, 'dst'])
         self.assertNotEqual(ret, 0)
+
+
+class TestMoveFileWithExtension(TestDvc):
+    def test(self):
+        with open(os.path.join(self.dvc.root_dir, 'file.csv'), 'w') as fd:
+            fd.write('1,2,3\n')
+
+        self.dvc.add('file.csv')
+
+        self.assertTrue(os.path.exists('file.csv'))
+        self.assertTrue(os.path.exists('file.csv.dvc'))
+
+        ret = main(['move', 'file.csv', 'other_name.csv'])
+        self.assertEqual(ret, 0)
+
+        self.assertFalse(os.path.exists('file.csv'))
+        self.assertFalse(os.path.exists('file.csv.dvc'))
+        self.assertTrue(os.path.exists('other_name.csv'))
+        self.assertTrue(os.path.exists('other_name.csv.dvc'))

pip install -e .[all]
parse_log_pytest
requirements.txt
pytest>=3.3.1 nose>=1.3.7 mock>=2.0.0 coverage>=4.5.1 codecov>=2.0.15 xmltodict>=0.11.0 awscli>=1.14.18 google-compute-engine Pygments collective.checkdocs
apt-get update apt-get install -y gcc
3.6
requirements.txt
pytest --no-header -rA --tb=line --color=no -p no:cacheprovider -W ignore::DeprecationWarning
altgraph==0.17.4
appdirs==1.4.4
asciimatics==1.14.0
attrs==22.2.0
awscli==1.24.10
azure-common==1.1.28
azure-nspkg==3.0.2
azure-storage-blob==1.3.0
azure-storage-common==1.3.0
azure-storage-nspkg==3.1.0
bcrypt==4.0.1
boto==2.49.0
boto3==1.7.4
botocore==1.10.84
cachetools==4.2.4
certifi==2021.5.30
cffi==1.15.1
charset-normalizer==2.0.12
codecov==2.1.13
collective.checkdocs==0.2
colorama==0.4.4
configobj==5.0.8
configparser==5.2.0
coverage==6.2
cryptography==40.0.2
decorator==4.4.2
distro==1.9.0
docutils==0.16
-e git+https://github.com/iterative/dvc.git@471029cc6dca7ebf70aa56902cb1621195c69b0b#egg=dvc
future==1.0.0
gitdb==4.0.9
GitPython==3.1.18
google-api-core==1.32.0
google-auth==1.35.0
google-cloud-core==0.28.1
google-cloud-storage==1.13.0
google-compute-engine==2.8.13
google-crc32c==1.3.0
google-resumable-media==2.3.3
googleapis-common-protos==1.56.3
grandalf==0.6
idna==3.10
importlib-metadata==4.8.3
iniconfig==1.1.1
jmespath==0.10.0
jsonpath-rw==1.4.0
macholib==1.16.3
mock==5.2.0
nanotime==0.5.2
networkx==2.5.1
nose==1.3.7
packaging==21.3
paramiko==3.5.1
pefile==2024.8.26
Pillow==8.4.0
pluggy==1.0.0
ply==3.11
protobuf==3.19.6
py==1.11.0
pyasn1==0.5.1
pyasn1-modules==0.3.0
pycparser==2.21
pydot==1.4.2
pyfiglet==0.8.post1
Pygments==2.14.0
PyInstaller==3.3.1
PyNaCl==1.5.0
pyparsing==3.1.4
pytest==7.0.1
python-dateutil==2.9.0.post0
pytz==2025.2
PyYAML==5.4.1
requests==2.27.1
rsa==4.7.2
s3transfer==0.1.13
schema==0.7.7
six==1.17.0
smmap==5.0.0
tomli==1.2.3
typing_extensions==4.1.1
urllib3==1.26.20
wcwidth==0.2.13
xmltodict==0.14.2
zc.lockfile==2.0
zipp==3.6.0

name: dvc
channels:
  - defaults
  - https://repo.anaconda.com/pkgs/main
  - https://repo.anaconda.com/pkgs/r
  - conda-forge
dependencies:
  - _libgcc_mutex=0.1=main
  - _openmp_mutex=5.1=1_gnu
  - ca-certificates=2025.2.25=h06a4308_0
  - certifi=2021.5.30=py36h06a4308_0
  - ld_impl_linux-64=2.40=h12ee557_0
  - libffi=3.3=he6710b0_2
  - libgcc-ng=11.2.0=h1234567_1
  - libgomp=11.2.0=h1234567_1
  - libstdcxx-ng=11.2.0=h1234567_1
  - ncurses=6.4=h6a678d5_0
  - openssl=1.1.1w=h7f8727e_0
  - pip=21.2.2=py36h06a4308_0
  - python=3.6.13=h12debd9_1
  - readline=8.2=h5eee18b_0
  - setuptools=58.0.4=py36h06a4308_0
  - sqlite=3.45.3=h5eee18b_0
  - tk=8.6.14=h39e8969_0
  - wheel=0.37.1=pyhd3eb1b0_0
  - xz=5.6.4=h5eee18b_1
  - zlib=1.2.13=h5eee18b_1
  - pip:
      - altgraph==0.17.4
      - appdirs==1.4.4
      - asciimatics==1.14.0
      - attrs==22.2.0
      - awscli==1.24.10
      - azure-common==1.1.28
      - azure-nspkg==3.0.2
      - azure-storage-blob==1.3.0
      - azure-storage-common==1.3.0
      - azure-storage-nspkg==3.1.0
      - bcrypt==4.0.1
      - boto==2.49.0
      - boto3==1.7.4
      - botocore==1.10.84
      - cachetools==4.2.4
      - cffi==1.15.1
      - charset-normalizer==2.0.12
      - codecov==2.1.13
      - collective-checkdocs==0.2
      - colorama==0.4.4
      - configobj==5.0.8
      - configparser==5.2.0
      - coverage==6.2
      - cryptography==40.0.2
      - decorator==4.4.2
      - distro==1.9.0
      - docutils==0.16
      - future==1.0.0
      - gitdb==4.0.9
      - gitpython==3.1.18
      - google-api-core==1.32.0
      - google-auth==1.35.0
      - google-cloud-core==0.28.1
      - google-cloud-storage==1.13.0
      - google-compute-engine==2.8.13
      - google-crc32c==1.3.0
      - google-resumable-media==2.3.3
      - googleapis-common-protos==1.56.3
      - grandalf==0.6
      - idna==3.10
      - importlib-metadata==4.8.3
      - iniconfig==1.1.1
      - jmespath==0.10.0
      - jsonpath-rw==1.4.0
      - macholib==1.16.3
      - mock==5.2.0
      - nanotime==0.5.2
      - networkx==2.5.1
      - nose==1.3.7
      - packaging==21.3
      - paramiko==3.5.1
      - pefile==2024.8.26
      - pillow==8.4.0
      - pluggy==1.0.0
      - ply==3.11
      - protobuf==3.19.6
      - py==1.11.0
      - pyasn1==0.5.1
      - pyasn1-modules==0.3.0
      - pycparser==2.21
      - pydot==1.4.2
      - pyfiglet==0.8.post1
      - pygments==2.14.0
      - pyinstaller==3.3.1
      - pynacl==1.5.0
      - pyparsing==3.1.4
      - pytest==7.0.1
      - python-dateutil==2.9.0.post0
      - pytz==2025.2
      - pyyaml==5.4.1
      - requests==2.27.1
      - rsa==4.7.2
      - s3transfer==0.1.13
      - schema==0.7.7
      - six==1.17.0
      - smmap==5.0.0
      - tomli==1.2.3
      - typing-extensions==4.1.1
      - urllib3==1.26.20
      - wcwidth==0.2.13
      - xmltodict==0.14.2
      - zc-lockfile==2.0
      - zipp==3.6.0
prefix: /opt/conda/envs/dvc

tests/test_move.py::TestMoveFileWithExtension::test
tests/test_move.py::TestMove::test tests/test_move.py::TestMoveNonExistentFile::test tests/test_move.py::TestMoveDirectory::test tests/test_move.py::TestCmdMove::test tests/test_move.py::TestMoveNotDataSource::test
dvc/project.py
dvc/project.py