diff --git a/compose/cli/command.py b/compose/cli/command.py
index dc7683a35..f92f95cd6 100644
--- a/compose/cli/command.py
+++ b/compose/cli/command.py
@@ -111,7 +111,7 @@ class Command(DocoptCommand):
             return os.path.join(self.base_dir, file_path)
 
         if os.path.exists(os.path.join(self.base_dir, 'docker-compose.yaml')):
-            log.warning("Fig just read the file 'docker-compose.yaml' on startup, rather "
+            log.warning("Compose just read the file 'docker-compose.yaml' on startup, rather "
                         "than 'docker-compose.yml'")
             log.warning("Please be aware that .yml is the expected extension "
                         "in most cases, and using .yaml can cause compatibility "
diff --git a/compose/project.py b/compose/project.py
index b707d6374..028c6a966 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -67,7 +67,7 @@ class Project(object):
         dicts = []
         for service_name, service in list(config.items()):
             if not isinstance(service, dict):
-                raise ConfigurationError('Service "%s" doesn\'t have any configuration options. All top level keys in your compose.yml must map to a dictionary of configuration options.' % service_name)
+                raise ConfigurationError('Service "%s" doesn\'t have any configuration options. All top level keys in your docker-compose.yml must map to a dictionary of configuration options.' % service_name)
             service['name'] = service_name
             dicts.append(service)
         return cls.from_dicts(name, dicts, client)
diff --git a/script/clean b/script/clean
index 0c845012c..07a9cff14 100755
--- a/script/clean
+++ b/script/clean
@@ -1,3 +1,3 @@
 #!/bin/sh
 find . -type f -name '*.pyc' -delete
-rm -rf docs/_site build dist compose.egg-info
+rm -rf docs/_site build dist docker-compose.egg-info