diff --git a/.gitignore b/.gitignore
index 9bf8925cf..2489e4413 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,6 @@ node_modules
 
 *.swp
 out/
-db/
+db/*
 
 .bit
diff --git a/bit-wallet/cli-utils.js b/bit-wallet/cli-utils.js
index 6bbbfffdc..429423bac 100644
--- a/bit-wallet/cli-utils.js
+++ b/bit-wallet/cli-utils.js
@@ -109,7 +109,7 @@ Utils.parseAmount = function(text) {
 Utils.configureCommander = function(program) {
   program
     .version('0.0.1')
-    .option('-f, --file [filename]', 'Wallet file', 'bit.dat')
+    .option('-f, --file [filename]', 'Wallet file', process.env['HOME'] + '/.bit.dat')
     .option('-h, --host [host]', 'Bitcore Wallet Service URL (eg: http://localhost:3001/copay/api')
     .option('-v, --verbose', 'be verbose')
 
diff --git a/db/.empty b/db/.empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/storage.js b/lib/storage.js
index 7319ad983..81e54ea28 100644
--- a/lib/storage.js
+++ b/lib/storage.js
@@ -16,7 +16,7 @@ var Notification = require('./model/notification');
 
 var Storage = function(opts) {
   opts = opts || {};
-  this.db = opts.db || levelup(opts.dbPath || './db/copay.db', {
+  this.db = opts.db || levelup(opts.dbPath || './db/bws.db', {
     valueEncoding: 'json'
   });
 };