diff --git a/lib/SerializerFileSystem.js b/lib/SerializerFileSystem.js
index 7bb324e85..35731e45f 100644
--- a/lib/SerializerFileSystem.js
+++ b/lib/SerializerFileSystem.js
@@ -249,9 +249,13 @@ class SerializerFileSystem {
                     return func.load()
                       .then(function(instance) {
 
-                          if (component.functions[instance.name]) {
+                          // Check for function name uniqueness across project
+                          let components = component.getProject().getAllComponents();
+                          components.forEach(function(c) {
+                            if (c.functions[instance.name]) {
                               throw new SError(`Function name is already taken in project: ${instance.name} Function names must be unique across a project as of Serverless v0.5`);
-                          }
+                            }
+                          });
 
                           component.functions[instance.name] = instance;
                       });