diff --git a/packages/cli/init/index.js b/packages/cli/init/index.js
index 21a7c27..4428b1a 100644
--- a/packages/cli/init/index.js
+++ b/packages/cli/init/index.js
@@ -12,9 +12,10 @@ const scaffold = require('./scaffold');
 const renderLastInit = require('./renderLastInit');
 
 const pkgJsonPath = path.join(process.cwd(), 'package.json');
-const pingyJsonPath = path.join(process.cwd(), '.pingy.json');
+const dotPingyJsonPath = path.join(process.cwd(), '.pingy.json');
+const pingyJsonPath = path.join(process.cwd(), 'pingy.json');
 const pkgJsonExists = fs.existsSync(pkgJsonPath);
-const pingyJsonExists = fs.existsSync(pingyJsonPath);
+const pingyJsonExists = fs.existsSync(pingyJsonPath) || fs.existsSync(dotPingyJsonPath);
 
 const requiredLastInitProps = ['html', 'scripts', 'styles'];
 const createChoices = type => [type, ...compilerMap[type].map(x => x.name)];
@@ -75,7 +76,7 @@ function prompt(options) {
             name: 'resume',
             default: false,
             message:
-              'Looks like you have run `pingy init` already. Pingy has detected a .pingy.json and package.json in your project, do you want to continue anyway?',
+              'Looks like you have run `pingy init` already. Pingy has detected a pingy.json and package.json in your project, do you want to continue anyway?',
           }
         ])
         .then(answers => resolve(answers.resume));
@@ -105,20 +106,11 @@ function prompt(options) {
     .then((resume) => {
       if (global.repeatLastInit) return processAnswers(options)(lastInit);
       if (resume) return inquirer.prompt(stage1).then(processAnswers(options));
+      return null;
     });
 }
 
 function init(options) {
-  // if (args.length > 0) {
-  //   return processAnswers(
-  //     {
-  //       html: args.html || 'HTML',
-  //       scripts: args.scripts || 'JS',
-  //       styles: args.styles || 'CSS',
-  //     },
-  //     true
-  //   );
-  // }
   return prompt(options);
 }
 
diff --git a/packages/cli/init/updatePkgScripts.js b/packages/cli/init/updatePkgScripts.js
index faa0964..f718c28 100644
--- a/packages/cli/init/updatePkgScripts.js
+++ b/packages/cli/init/updatePkgScripts.js
@@ -6,7 +6,7 @@ const path = require('path');
 const dotPingyTmpl = require('./dotPingyTmpl');
 
 function createDotPingy(name) {
-  const filename = '.pingy.json';
+  const filename = 'pingy.json';
   const spinner = ora(`Creating ${filename}`).start();
   try {
     fs.writeFileSync(path.join(process.cwd(), filename), dotPingyTmpl(name), 'utf8');
diff --git a/packages/cli/pingyJson.js b/packages/cli/pingyJson.js
index 13e8e1e..0f67b83 100644
--- a/packages/cli/pingyJson.js
+++ b/packages/cli/pingyJson.js
@@ -6,11 +6,11 @@ const chalk = require('chalk');
 const findUp = require('find-up');
 
 function getPingyJson() {
-  const jsonPath = findUp.sync(['.pingy.json', '.pingy']);
+  const jsonPath = findUp.sync(['pingy.json', '.pingy.json']);
   if (!jsonPath) {
     console.log(
       chalk.red(
-        `${chalk.bold('File not found')}: .pingy.json.\nPlease create it or run \`pingy init\`.`
+        `${chalk.bold('File not found')}: pingy.json.\nPlease create it or run \`pingy init\`.`
       )
     );
     return false;
diff --git a/packages/cli/test/1-test-simple.spec.js b/packages/cli/test/1-test-simple.spec.js
index c75f4b4..add0d3b 100644
--- a/packages/cli/test/1-test-simple.spec.js
+++ b/packages/cli/test/1-test-simple.spec.js
@@ -39,7 +39,7 @@ before(function (done) {
 });
 
 describe('cli simple', function cli() {
-  const pingyJsonPath = path.join(projectPath, '.pingy.json');
+  const pingyJsonPath = path.join(projectPath, 'pingy.json');
   const indexHtml = path.join(projectPath, 'index.html');
   const scripts = path.join(projectPath, 'scripts', 'main.js');
   const styles = path.join(projectPath, 'styles', 'main.css');
@@ -87,7 +87,7 @@ describe('cli simple', function cli() {
         fs.unlinkSync(styles);
       } catch (e) {}
     });
-    it('should create .pingy.json and scaffold using init command', function() {
+    it('should create pingy.json and scaffold using init command', function() {
       const spawned = spawn('node', ['../../cli.js', 'init', '--ask'], {
         cwd: projectPath,
       });
@@ -399,7 +399,7 @@ describe('cli simple', function cli() {
         fs.unlinkSync(styles);
       } catch (e) {}
     });
-    it('should create .pingy.json and scaffold using init command', function() {
+    it('should create pingy.json and scaffold using init command', function() {
       const spawned = spawn('node', ['../../cli.js', 'init'], {
         cwd: projectPath,
       });
diff --git a/packages/cli/test/2-test-advanced.spec.js b/packages/cli/test/2-test-advanced.spec.js
index bac31d5..10d930a 100644
--- a/packages/cli/test/2-test-advanced.spec.js
+++ b/packages/cli/test/2-test-advanced.spec.js
@@ -44,7 +44,7 @@ before(function (done) {
 });
 
 describe('cli advanced', function cli() {
-  const pingyJsonPath = path.join(projectPath, '.pingy.json');
+  const pingyJsonPath = path.join(projectPath, 'pingy.json');
   const indexHtml = path.join(projectPath, 'index.pug');
   const scripts = path.join(projectPath, 'scripts', 'main.babel.js');
   const styles = path.join(projectPath, 'styles', 'main.scss');
@@ -84,7 +84,7 @@ describe('cli advanced', function cli() {
   };
 
   describe('init', function() {
-    it('should create .pingy.json and scaffold using init command', function() {
+    it('should create pingy.json and scaffold using init command', function() {
       const spawnedInit = spawn('node', ['../../cli.js', 'init', '--global-pingy'], {
         cwd: projectPath,
       });