1 files changed, 14 insertions, 9 deletions
diff --git a/lib/company.js b/lib/company.js
index ee248d48..603b8071 100644
--- a/lib/company.js
+++ b/lib/company.js
@@ -1,4 +1,5 @@
-var faker = require('../index');
+var faker = require('../index'),
+f = faker.fake;
 
 var company = {
 
@@ -8,14 +9,18 @@ var company = {
     },
 
     companyName: function (format) {
-        switch ((format ? format : faker.random.number(2))) {
-        case 0:
-            return faker.name.lastName() + " " + faker.company.companySuffix();
-        case 1:
-            return faker.name.lastName() + "-" + faker.name.lastName();
-        case 2:
-            return faker.name.lastName() + ", " + faker.name.lastName() + " and " + faker.name.lastName();
-        }
+
+      var formats = [
+        '{{name.lastName}} {{company.companySuffix}}',
+        '{{name.lastName}} - {{name.lastName}}',
+        '{{name.lastName}}, {{name.lastName}} and {{name.lastName}}'
+      ];
+
+      if (typeof format !== "number") {
+        format = faker.random.number(formats.length);
+      }
+
+      return f(formats[format]);
     },
 
     companySuffix: function () {