diff --git a/snapcraft/commands/upload.py b/snapcraft/commands/upload.py
index c01d005..f6c8975 100644
--- a/snapcraft/commands/upload.py
+++ b/snapcraft/commands/upload.py
@@ -73,14 +73,20 @@ def main(argv=None):
         # make sure the full lifecycle is executed
         yaml_config = snapcraft.yaml.load_config()
         snap_filename = format_snap_name(yaml_config.data)
+        snap_name = yaml_config.data['name']
 
         if not os.path.exists(snap_filename):
             logger.info(
                 'Snap {} not found. Running snap step to create it.'.format(
                     snap_filename))
             snap.main(argv=argv)
+        else:
+            expected_snap_name = _get_name_from_snap_file(snap_filename)
+            if expected_snap_name != snap_filename:
+                raise ValueError(
+                    'The name of the snap {} is not the same as the one '
+                    'definde in snapcraft.yaml. You should snap it again.')
 
-        snap_name = yaml_config.data['name']
 
     config = load_config()
     upload(snap_filename, snap_name, config=config)