diff --git a/core/commands/active.go b/core/commands/active.go
index 11508d445..853ad8bdd 100644
--- a/core/commands/active.go
+++ b/core/commands/active.go
@@ -19,7 +19,7 @@ const (
 
 var ActiveReqsCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
-		Tagline: "List commands run on this IPFS node.",
+		Tagline: "List commands run on this BTFS node.",
 		ShortDescription: `
 Lists running and recently run commands.
 `,
diff --git a/core/commands/add.go b/core/commands/add.go
index e6e78c1da..62cc7fa31 100644
--- a/core/commands/add.go
+++ b/core/commands/add.go
@@ -52,13 +52,13 @@ const adderOutChanSize = 8
 
 var AddCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
-		Tagline: "Add a file or directory to ipfs.",
+		Tagline: "Add a file or directory to btfs.",
 		ShortDescription: `
-Adds contents of <path> to ipfs. Use -r to add directories (recursively).
+Adds contents of <path> to btfs. Use -r to add directories (recursively).
 `,
 		LongDescription: `
-Adds contents of <path> to ipfs. Use -r to add directories.
-Note that directories are added recursively, to form the ipfs
+Adds contents of <path> to btfs. Use -r to add directories.
+Note that directories are added recursively, to form the btfs
 MerkleDAG.
 
 The wrap option, '-w', wraps the file (or files, if using the
@@ -66,15 +66,15 @@ recursive option) in a directory. This directory contains only
 the files which have been added, and means that the file retains
 its filename. For example:
 
-  > ipfs add example.jpg
+  > btfs add example.jpg
   added QmbFMke1KXqnYyBBWxB74N4c5SBnJMVAiMNRcGu6x1AwQH example.jpg
-  > ipfs add example.jpg -w
+  > btfs add example.jpg -w
   added QmbFMke1KXqnYyBBWxB74N4c5SBnJMVAiMNRcGu6x1AwQH example.jpg
   added QmaG4FuMqEBnQNn3C8XJ5bpW8kLs7zq2ZXgHptJHbKDDVx
 
 You can now refer to the added file in a gateway, like so:
 
-  /ipfs/QmaG4FuMqEBnQNn3C8XJ5bpW8kLs7zq2ZXgHptJHbKDDVx/example.jpg
+  /btfs/QmaG4FuMqEBnQNn3C8XJ5bpW8kLs7zq2ZXgHptJHbKDDVx/example.jpg
 
 The chunker option, '-s', specifies the chunking strategy that dictates
 how to break files into blocks. Blocks with same content can
@@ -89,17 +89,17 @@ The following examples use very small byte sizes to demonstrate the
 properties of the different chunkers on a small file. You'll likely
 want to use a 1024 times larger chunk sizes for most files.
 
-  > ipfs add --chunker=size-2048 ipfs-logo.svg
+  > btfs add --chunker=size-2048 ipfs-logo.svg
   added QmafrLBfzRLV4XSH1XcaMMeaXEUhDJjmtDfsYU95TrWG87 ipfs-logo.svg
-  > ipfs add --chunker=rabin-512-1024-2048 ipfs-logo.svg
+  > btfs add --chunker=rabin-512-1024-2048 ipfs-logo.svg
   added Qmf1hDN65tR55Ubh2RN1FPxr69xq3giVBz1KApsresY8Gn ipfs-logo.svg
 
 You can now check what blocks have been created by:
 
-  > ipfs object links QmafrLBfzRLV4XSH1XcaMMeaXEUhDJjmtDfsYU95TrWG87
+  > btfs object links QmafrLBfzRLV4XSH1XcaMMeaXEUhDJjmtDfsYU95TrWG87
   QmY6yj1GsermExDXoosVE3aSPxdMNYr6aKuw3nA8LoWPRS 2059
   Qmf7ZQeSxq2fJVJbCmgTrLLVN9tDR9Wy5k75DxQKuz5Gyt 1195
-  > ipfs object links Qmf1hDN65tR55Ubh2RN1FPxr69xq3giVBz1KApsresY8Gn
+  > btfs object links Qmf1hDN65tR55Ubh2RN1FPxr69xq3giVBz1KApsresY8Gn
   QmY6yj1GsermExDXoosVE3aSPxdMNYr6aKuw3nA8LoWPRS 2059
   QmerURi9k4XzKCaaPbsK6BL5pMEjF7PGphjDvkkjDtsVf3 868
   QmQB28iwSriSUSMqG2nXDTLtdPHgWb4rebBrU7Q1j4vxPv 338
@@ -107,7 +107,7 @@ You can now check what blocks have been created by:
 	},
 
 	Arguments: []cmdkit.Argument{
-		cmdkit.FileArg("path", true, true, "The path to a file to be added to ipfs.").EnableRecursive().EnableStdin(),
+		cmdkit.FileArg("path", true, true, "The path to a file to be added to btfs.").EnableRecursive().EnableStdin(),
 	},
 	Options: []cmdkit.Option{
 		cmds.OptionRecursivePath, // a builtin option that allows recursive paths (-r, --recursive)
@@ -142,7 +142,7 @@ You can now check what blocks have been created by:
 			return nil
 		}
 
-		// ipfs cli progress bar defaults to true unless quiet or silent is used
+		// btfs cli progress bar defaults to true unless quiet or silent is used
 		_, found := req.Options[progressOptionName].(bool)
 		if !found {
 			req.Options[progressOptionName] = true
diff --git a/core/commands/block.go b/core/commands/block.go
index 6e6b24afc..e270649a5 100644
--- a/core/commands/block.go
+++ b/core/commands/block.go
@@ -27,9 +27,9 @@ func (bs BlockStat) String() string {
 
 var BlockCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
-		Tagline: "Interact with raw IPFS blocks.",
+		Tagline: "Interact with raw BTFS blocks.",
 		ShortDescription: `
-'ipfs block' is a plumbing command used to manipulate raw IPFS blocks.
+'btfs block' is a plumbing command used to manipulate raw BTFS blocks.
 Reads from stdin or writes to stdout, and <key> is a base58 encoded
 multihash.
 `,
@@ -45,10 +45,10 @@ multihash.
 
 var blockStatCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
-		Tagline: "Print information of a raw IPFS block.",
+		Tagline: "Print information of a raw BTFS block.",
 		ShortDescription: `
-'ipfs block stat' is a plumbing command for retrieving information
-on raw IPFS blocks. It outputs the following to stdout:
+'btfs block stat' is a plumbing command for retrieving information
+on raw BTFS blocks. It outputs the following to stdout:
 
 	Key  - the base58 encoded multihash
 	Size - the size of the block in bytes
@@ -91,9 +91,9 @@ on raw IPFS blocks. It outputs the following to stdout:
 
 var blockGetCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
-		Tagline: "Get a raw IPFS block.",
+		Tagline: "Get a raw BTFS block.",
 		ShortDescription: `
-'ipfs block get' is a plumbing command for retrieving raw IPFS blocks.
+'btfs block get' is a plumbing command for retrieving raw BTFS blocks.
 It outputs to stdout, and <key> is a base58 encoded multihash.
 `,
 	},
@@ -129,9 +129,9 @@ const (
 
 var blockPutCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
-		Tagline: "Store input as an IPFS block.",
+		Tagline: "Store input as an BTFS block.",
 		ShortDescription: `
-'ipfs block put' is a plumbing command for storing raw IPFS blocks.
+'btfs block put' is a plumbing command for storing raw BTFS blocks.
 It reads from stdin, and <key> is a base58 encoded multihash.
 
 By default CIDv0 is going to be generated. Setting 'mhtype' to anything other
@@ -140,7 +140,7 @@ than 'sha2-256' or format to anything other than 'v0' will result in CIDv1.
 	},
 
 	Arguments: []cmdkit.Argument{
-		cmdkit.FileArg("data", true, false, "The data to be stored as an IPFS block.").EnableStdin(),
+		cmdkit.FileArg("data", true, false, "The data to be stored as an BTFS block.").EnableStdin(),
 	},
 	Options: []cmdkit.Option{
 		cmdkit.StringOption(blockFormatOptionName, "f", "cid format for blocks to be created with."),
@@ -210,9 +210,9 @@ const (
 
 var blockRmCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
-		Tagline: "Remove IPFS block(s).",
+		Tagline: "Remove BTFS block(s).",
 		ShortDescription: `
-'ipfs block rm' is a plumbing command for removing raw ipfs blocks.
+'btfs block rm' is a plumbing command for removing raw btfs blocks.
 It takes a list of base58 encoded multihashes to remove.
 `,
 	},
diff --git a/core/commands/bootstrap.go b/core/commands/bootstrap.go
index d9efce351..4be8f32d1 100644
--- a/core/commands/bootstrap.go
+++ b/core/commands/bootstrap.go
@@ -24,7 +24,7 @@ var BootstrapCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
 		Tagline: "Show or edit the list of bootstrap peers.",
 		ShortDescription: `
-Running 'ipfs bootstrap' with no arguments will run 'ipfs bootstrap list'.
+Running 'btfs bootstrap' with no arguments will run 'btfs bootstrap list'.
 ` + bootstrapSecurityWarning,
 	},
 
diff --git a/core/commands/cat.go b/core/commands/cat.go
index 3fe5ee7bf..bf51a76f0 100644
--- a/core/commands/cat.go
+++ b/core/commands/cat.go
@@ -22,12 +22,12 @@ const (
 
 var CatCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
-		Tagline:          "Show IPFS object data.",
-		ShortDescription: "Displays the data contained by an IPFS or IPNS object(s) at the given path.",
+		Tagline:          "Show BTFS object data.",
+		ShortDescription: "Displays the data contained by an BTFS or BTNS object(s) at the given path.",
 	},
 
 	Arguments: []cmdkit.Argument{
-		cmdkit.StringArg("ipfs-path", true, true, "The path to the IPFS object(s) to be outputted.").EnableStdin(),
+		cmdkit.StringArg("ipfs-path", true, true, "The path to the BTFS object(s) to be outputted.").EnableStdin(),
 	},
 	Options: []cmdkit.Option{
 		cmdkit.Int64Option(offsetOptionName, "o", "Byte offset to begin reading from."),
diff --git a/core/commands/commands.go b/core/commands/commands.go
index 2788e017f..bd8f381c5 100644
--- a/core/commands/commands.go
+++ b/core/commands/commands.go
@@ -1,7 +1,7 @@
 // Package commands implements the ipfs command interface
 //
 // Using github.com/ipfs/go-ipfs/commands to define the command line and HTTP
-// APIs.  This is the interface available to folks using IPFS from outside of
+// APIs.  This is the interface available to folks using BTFS from outside of
 // the Go language.
 package commands
 
diff --git a/core/commands/config.go b/core/commands/config.go
index 8c7869e91..646dab350 100644
--- a/core/commands/config.go
+++ b/core/commands/config.go
@@ -39,25 +39,25 @@ const (
 
 var ConfigCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
-		Tagline: "Get and set ipfs config values.",
+		Tagline: "Get and set btfs config values.",
 		ShortDescription: `
-'ipfs config' controls configuration variables. It works like 'git config'.
-The configuration values are stored in a config file inside your ipfs
+'btfs config' controls configuration variables. It works like 'git config'.
+The configuration values are stored in a config file inside your btfs
 repository.`,
 		LongDescription: `
-'ipfs config' controls configuration variables. It works
+'btfs config' controls configuration variables. It works
 much like 'git config'. The configuration values are stored in a config
-file inside your IPFS repository.
+file inside your BTFS repository.
 
 Examples:
 
 Get the value of the 'Datastore.Path' key:
 
-  $ ipfs config Datastore.Path
+  $ btfs config Datastore.Path
 
 Set the value of the 'Datastore.Path' key:
 
-  $ ipfs config Datastore.Path ~/.ipfs/datastore
+  $ btfs config Datastore.Path ~/.btfs/datastore
 `,
 	},
 	Subcommands: map[string]*cmds.Command{
@@ -236,7 +236,7 @@ var configEditCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
 		Tagline: "Open the config file for editing in $EDITOR.",
 		ShortDescription: `
-To use 'ipfs config edit', you must have the $EDITOR environment
+To use 'btfs config edit', you must have the $EDITOR environment
 variable set to your preferred text editor.
 `,
 	},
diff --git a/core/commands/dht.go b/core/commands/dht.go
index c5011abcd..c286320a6 100644
--- a/core/commands/dht.go
+++ b/core/commands/dht.go
@@ -24,8 +24,8 @@ import (
 
 var ErrNotDHT = errors.New("routing service is not a DHT")
 
-// TODO: Factor into `ipfs dht` and `ipfs routing`.
-// Everything *except `query` goes into `ipfs routing`.
+// TODO: Factor into `btfs dht` and `btfs routing`.
+// Everything *except `query` goes into `btfs routing`.
 
 var DhtCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
@@ -515,9 +515,9 @@ Keys have two parts: a keytype (foo) and the key name (bar). IPNS uses the
 /ipns keytype, and expects the key name to be a Peer ID. IPNS entries are
 specifically formatted (protocol buffer).
 
-You may only use keytypes that are supported in your ipfs binary: currently
+You may only use keytypes that are supported in your btfs binary: currently
 this is only /ipns. Unless you have a relatively deep understanding of the
-go-ipfs routing internals, you likely want to be using 'ipfs name publish' instead
+go-ipfs routing internals, you likely want to be using 'btfs name publish' instead
 of this.
 
 Value is arbitrary text. Standard input can be used to provide value.
diff --git a/core/commands/dns.go b/core/commands/dns.go
index f1f309cd8..7f6434ad2 100644
--- a/core/commands/dns.go
+++ b/core/commands/dns.go
@@ -22,35 +22,35 @@ var DNSCmd = &cmds.Command{
 		ShortDescription: `
 Multihashes are hard to remember, but domain names are usually easy to
 remember.  To create memorable aliases for multihashes, DNS TXT
-records can point to other DNS links, IPFS objects, IPNS keys, etc.
+records can point to other DNS links, BTFS objects, IPNS keys, etc.
 This command resolves those links to the referenced object.
 `,
 		LongDescription: `
 Multihashes are hard to remember, but domain names are usually easy to
 remember.  To create memorable aliases for multihashes, DNS TXT
-records can point to other DNS links, IPFS objects, IPNS keys, etc.
+records can point to other DNS links, BTFS objects, IPNS keys, etc.
 This command resolves those links to the referenced object.
 
 Note: This command can only recursively resolve DNS links,
 it will fail to recursively resolve through IPNS keys etc.
-For general-purpose recursive resolution, use ipfs name resolve -r.
+For general-purpose recursive resolution, use btfs name resolve -r.
 
 For example, with this DNS TXT record:
 
 	> dig +short TXT _dnslink.ipfs.io
-	dnslink=/ipfs/QmRzTuh2Lpuz7Gr39stNr6mTFdqAghsZec1JoUnfySUzcy
+	dnslink=/btfs/QmRzTuh2Lpuz7Gr39stNr6mTFdqAghsZec1JoUnfySUzcy
 
 The resolver will give:
 
-	> ipfs dns ipfs.io
-	/ipfs/QmRzTuh2Lpuz7Gr39stNr6mTFdqAghsZec1JoUnfySUzcy
+	> btfs dns ipfs.io
+	/btfs/QmRzTuh2Lpuz7Gr39stNr6mTFdqAghsZec1JoUnfySUzcy
 
 The resolver can recursively resolve:
 
 	> dig +short TXT recursive.ipfs.io
 	dnslink=/ipns/ipfs.io
-	> ipfs dns -r recursive.ipfs.io
-	/ipfs/QmRzTuh2Lpuz7Gr39stNr6mTFdqAghsZec1JoUnfySUzcy
+	> btfs dns -r recursive.ipfs.io
+	/btfs/QmRzTuh2Lpuz7Gr39stNr6mTFdqAghsZec1JoUnfySUzcy
 `,
 	},
 
diff --git a/core/commands/external.go b/core/commands/external.go
index 926ccccba..f6279c2d7 100644
--- a/core/commands/external.go
+++ b/core/commands/external.go
@@ -28,7 +28,7 @@ func ExternalBinary() *cmds.Command {
 						buf := new(bytes.Buffer)
 						fmt.Fprintf(buf, "%s is an 'external' command.\n", binname)
 						fmt.Fprintf(buf, "It does not currently appear to be installed.\n")
-						fmt.Fprintf(buf, "Please refer to the ipfs documentation for instructions.\n")
+						fmt.Fprintf(buf, "Please refer to the btfs documentation for instructions.\n")
 						return res.Emit(buf)
 					}
 				}
diff --git a/core/commands/files.go b/core/commands/files.go
index 928434d72..a418de803 100644
--- a/core/commands/files.go
+++ b/core/commands/files.go
@@ -31,21 +31,21 @@ import (
 
 var flog = logging.Logger("cmds/files")
 
-// FilesCmd is the 'ipfs files' command
+// FilesCmd is the 'btfs files' command
 var FilesCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
 		Tagline: "Interact with unixfs files.",
 		ShortDescription: `
-Files is an API for manipulating IPFS objects as if they were a unix
+Files is an API for manipulating BTFS objects as if they were a unix
 filesystem.
 
 NOTE:
-Most of the subcommands of 'ipfs files' accept the '--flush' flag. It defaults
+Most of the subcommands of 'btfs files' accept the '--flush' flag. It defaults
 to true. Use caution when setting this flag to false. It will improve
 performance for large numbers of file operations, but it does so at the cost
 of consistency guarantees. If the daemon is unexpectedly killed before running
-'ipfs files flush' on the files in question, then data may be lost. This also
-applies to running 'ipfs repo gc' concurrently with '--flush=false'
+'btfs files flush' on the files in question, then data may be lost. This also
+applies to running 'btfs repo gc' concurrently with '--flush=false'
 operations.
 `,
 	},
@@ -362,7 +362,7 @@ var filesCpCmd = &cmds.Command{
 
 func getNodeFromPath(ctx context.Context, node *core.IpfsNode, api iface.CoreAPI, p string) (ipld.Node, error) {
 	switch {
-	case strings.HasPrefix(p, "/ipfs/"):
+	case strings.HasPrefix(p, "/btfs/"):
 		np, err := iface.ParsePath(p)
 		if err != nil {
 			return nil, err
@@ -396,7 +396,7 @@ List directories in the local mutable namespace.
 
 Examples:
 
-    $ ipfs files ls /welcome/docs/
+    $ btfs files ls /welcome/docs/
     about
     contact
     help
@@ -404,7 +404,7 @@ Examples:
     readme
     security-notes
 
-    $ ipfs files ls /myfiles/a/b/c/d
+    $ btfs files ls /myfiles/a/b/c/d
     foo
     bar
 `,
@@ -532,7 +532,7 @@ will read the entire file similar to unix cat.
 
 Examples:
 
-    $ ipfs files read /test/hello
+    $ btfs files read /test/hello
     hello
         `,
 	},
@@ -624,7 +624,7 @@ Move files around. Just like traditional unix mv.
 
 Example:
 
-    $ ipfs files mv /myfs/a/b/c /myfs/foo/newc
+    $ btfs files mv /myfs/a/b/c /myfs/foo/newc
 
 `,
 	},
@@ -690,13 +690,13 @@ of writes to a deeper directory structure.
 
 EXAMPLE:
 
-    echo "hello world" | ipfs files write --create /myfs/a/b/file
-    echo "hello world" | ipfs files write --truncate /myfs/a/b/file
+    echo "hello world" | btfs files write --create /myfs/a/b/file
+    echo "hello world" | btfs files write --truncate /myfs/a/b/file
 
 WARNING:
 
 Usage of the '--flush=false' option does not guarantee data durability until
-the tree has been flushed. This can be accomplished by running 'ipfs files
+the tree has been flushed. This can be accomplished by running 'btfs files
 stat' on the file or any of its ancestors.
 `,
 	},
@@ -816,8 +816,8 @@ NOTE: All paths must be absolute.
 
 Examples:
 
-    $ ipfs files mkdir /test/newdir
-    $ ipfs files mkdir -p /test/does/not/exist/yet
+    $ btfs files mkdir /test/newdir
+    $ btfs files mkdir -p /test/does/not/exist/yet
 `,
 	},
 
@@ -966,12 +966,12 @@ var filesRmCmd = &cmds.Command{
 		ShortDescription: `
 Remove files or directories.
 
-    $ ipfs files rm /foo
-    $ ipfs files ls /bar
+    $ btfs files rm /foo
+    $ btfs files ls /bar
     cat
     dog
     fish
-    $ ipfs files rm -r /bar
+    $ btfs files rm -r /bar
 `,
 	},
 
diff --git a/core/commands/get.go b/core/commands/get.go
index a11a6456c..ab8e9f9d2 100644
--- a/core/commands/get.go
+++ b/core/commands/get.go
@@ -33,11 +33,11 @@ const (
 
 var GetCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
-		Tagline: "Download IPFS objects.",
+		Tagline: "Download BTFS objects.",
 		ShortDescription: `
 Stores to disk the data contained an BTFS or BTNS object(s) at the given path.
 
-By default, the output will be stored at './<ipfs-path>', but an alternate
+By default, the output will be stored at './<btfs-path>', but an alternate
 path can be specified with '--output=<path>' or '-o=<path>'.
 
 To output a TAR archive instead of unpacked files, use '--archive' or '-a'.
@@ -48,7 +48,7 @@ may also specify the level of compression by specifying '-l=<1-9>'.
 	},
 
 	Arguments: []cmdkit.Argument{
-		cmdkit.StringArg("ipfs-path", true, false, "The path to the IPFS object(s) to be outputted.").EnableStdin(),
+		cmdkit.StringArg("ipfs-path", true, false, "The path to the BTFS object(s) to be outputted.").EnableStdin(),
 	},
 	Options: []cmdkit.Option{
 		cmdkit.StringOption(outputOptionName, "o", "The path where the output should be stored."),
diff --git a/core/commands/id.go b/core/commands/id.go
index ad63a641e..aef972b0c 100644
--- a/core/commands/id.go
+++ b/core/commands/id.go
@@ -20,13 +20,13 @@ import (
 	identify "github.com/libp2p/go-libp2p/p2p/protocol/identify"
 )
 
-const offlineIdErrorMessage = `'ipfs id' currently cannot query information on remote
+const offlineIdErrorMessage = `'btfs id' currently cannot query information on remote
 peers without a running daemon; we are working to fix this.
-In the meantime, if you want to query remote peers using 'ipfs id',
+In the meantime, if you want to query remote peers using 'btfs id',
 please run the daemon:
 
-    ipfs daemon &
-    ipfs id QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ
+    btfs daemon &
+    btfs id QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ
 `
 
 type IdOutput struct {
@@ -43,12 +43,12 @@ const (
 
 var IDCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
-		Tagline: "Show ipfs node id info.",
+		Tagline: "Show btfs node id info.",
 		ShortDescription: `
 Prints out information about the specified peer.
 If no peer is specified, prints out information for local peers.
 
-'ipfs id' supports the format option for output with the following keys:
+'btfs id' supports the format option for output with the following keys:
 <id> : The peers id.
 <aver>: Agent version.
 <pver>: Protocol version.
@@ -57,7 +57,7 @@ If no peer is specified, prints out information for local peers.
 
 EXAMPLE:
 
-    ipfs id Qmece2RkXhsKe5CRooNisBTh4SK119KrXXGmoK6V3kb8aH -f="<addrs>\n"
+    btfs id Qmece2RkXhsKe5CRooNisBTh4SK119KrXXGmoK6V3kb8aH -f="<addrs>\n"
 `,
 	},
 	Arguments: []cmdkit.Argument{
diff --git a/core/commands/keystore.go b/core/commands/keystore.go
index 1935314aa..80dcb16e3 100644
--- a/core/commands/keystore.go
+++ b/core/commands/keystore.go
@@ -16,15 +16,15 @@ var KeyCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
 		Tagline: "Create and list IPNS name keypairs",
 		ShortDescription: `
-'ipfs key gen' generates a new keypair for usage with IPNS and 'ipfs name
+'btfs key gen' generates a new keypair for usage with BTNS and 'btfs name
 publish'.
 
-  > ipfs key gen --type=rsa --size=2048 mykey
-  > ipfs name publish --key=mykey QmSomeHash
+  > btfs key gen --type=rsa --size=2048 mykey
+  > btfs name publish --key=mykey QmSomeHash
 
-'ipfs key list' lists the available keys.
+'btfs key list' lists the available keys.
 
-  > ipfs key list
+  > btfs key list
   self
   mykey
 		`,
diff --git a/core/commands/log.go b/core/commands/log.go
index 93f35bf97..b0f789605 100644
--- a/core/commands/log.go
+++ b/core/commands/log.go
@@ -20,7 +20,7 @@ var LogCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
 		Tagline: "Interact with the daemon log output.",
 		ShortDescription: `
-'ipfs log' contains utility commands to affect or read the logging
+'btfs log' contains utility commands to affect or read the logging
 output of a running daemon.
 
 There are also two environmental variables that direct the logging 
@@ -84,7 +84,7 @@ var logLsCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
 		Tagline: "List the logging subsystems.",
 		ShortDescription: `
-'ipfs log ls' is a utility command used to list the logging
+'btfs log ls' is a utility command used to list the logging
 subsystems of a running daemon.
 `,
 	},
diff --git a/core/commands/ls.go b/core/commands/ls.go
index ba301a85f..1d2659fb8 100644
--- a/core/commands/ls.go
+++ b/core/commands/ls.go
@@ -59,7 +59,7 @@ The JSON output contains type information.
 	},
 
 	Arguments: []cmdkit.Argument{
-		cmdkit.StringArg("ipfs-path", true, true, "The path to the IPFS object(s) to list links from.").EnableStdin(),
+		cmdkit.StringArg("ipfs-path", true, true, "The path to the BTFS object(s) to list links from.").EnableStdin(),
 	},
 	Options: []cmdkit.Option{
 		cmdkit.BoolOption(lsHeadersOptionNameTime, "v", "Print table headers (Hash, Size, Name)."),
diff --git a/core/commands/mount_nofuse.go b/core/commands/mount_nofuse.go
index 33f07c5bb..76631138e 100644
--- a/core/commands/mount_nofuse.go
+++ b/core/commands/mount_nofuse.go
@@ -9,11 +9,11 @@ import (
 
 var MountCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
-		Tagline: "Mounts ipfs to the filesystem (disabled).",
+		Tagline: "Mounts btfs to the filesystem (disabled).",
 		ShortDescription: `
-This version of ipfs is compiled without fuse support, which is required
+This version of btfs is compiled without fuse support, which is required
 for mounting. If you'd like to be able to mount, please use a version of
-ipfs compiled with fuse.
+btfs compiled with fuse.
 
 For the latest instructions, please check the project's repository:
   http://github.com/ipfs/go-ipfs
diff --git a/core/commands/p2p.go b/core/commands/p2p.go
index 7c2160688..65211ff25 100644
--- a/core/commands/p2p.go
+++ b/core/commands/p2p.go
@@ -58,7 +58,7 @@ const (
 
 var resolveTimeout = 10 * time.Second
 
-// P2PCmd is the 'ipfs p2p' command
+// P2PCmd is the 'btfs p2p' command
 var P2PCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
 		Tagline: "Libp2p stream mounting.",
@@ -88,7 +88,7 @@ Forward connections made to <listen-address> to <target-address>.
 connections and/or handlers. It must be prefixed with '` + P2PProtoPrefix + `'.
 
 Example:
-  ipfs p2p forward ` + P2PProtoPrefix + `myproto /ip4/127.0.0.1/tcp/4567 /ipfs/QmPeer
+  btfs p2p forward ` + P2PProtoPrefix + `myproto /ip4/127.0.0.1/tcp/4567 /ipfs/QmPeer
     - Forward connections to 127.0.0.1:4567 to '` + P2PProtoPrefix + `myproto' service on /ipfs/QmPeer
 
 `,
@@ -176,7 +176,7 @@ Create libp2p service and forward connections made to <target-address>.
 <protocol> specifies the libp2p handler name. It must be prefixed with '` + P2PProtoPrefix + `'.
 
 Example:
-  ipfs p2p listen ` + P2PProtoPrefix + `myproto /ip4/127.0.0.1/tcp/1234
+  btfs p2p listen ` + P2PProtoPrefix + `myproto /ip4/127.0.0.1/tcp/1234
     - Forward connections to 'myproto' libp2p service to 127.0.0.1:1234
 
 `,
@@ -410,7 +410,7 @@ var p2pCloseCmd = &cmds.Command{
 // Stream
 //
 
-// p2pStreamCmd is the 'ipfs p2p stream' command
+// p2pStreamCmd is the 'btfs p2p stream' command
 var p2pStreamCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
 		Tagline:          "P2P stream management.",
diff --git a/core/commands/pin.go b/core/commands/pin.go
index 0379f1635..ffbc11ae1 100644
--- a/core/commands/pin.go
+++ b/core/commands/pin.go
@@ -55,7 +55,7 @@ const (
 var addPinCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
 		Tagline:          "Pin objects to local storage.",
-		ShortDescription: "Stores an IPFS object(s) from a given path locally to disk.",
+		ShortDescription: "Stores an BTFS object(s) from a given path locally to disk.",
 	},
 
 	Arguments: []cmdkit.Argument{
@@ -301,18 +301,18 @@ object. And if --type=<type> is additionally used, the command will also fail
 if any of the arguments is not of the specified type.
 
 Example:
-	$ echo "hello" | ipfs add -q
+	$ echo "hello" | btfs add -q
 	QmZULkCELmmk5XNfCgTnCyFgAVxBRBXyDHGGMVoLFLiXEN
-	$ ipfs pin ls
+	$ btfs pin ls
 	QmZULkCELmmk5XNfCgTnCyFgAVxBRBXyDHGGMVoLFLiXEN recursive
 	# now remove the pin, and repin it directly
-	$ ipfs pin rm QmZULkCELmmk5XNfCgTnCyFgAVxBRBXyDHGGMVoLFLiXEN
+	$ btfs pin rm QmZULkCELmmk5XNfCgTnCyFgAVxBRBXyDHGGMVoLFLiXEN
 	unpinned QmZULkCELmmk5XNfCgTnCyFgAVxBRBXyDHGGMVoLFLiXEN
-	$ ipfs pin add -r=false QmZULkCELmmk5XNfCgTnCyFgAVxBRBXyDHGGMVoLFLiXEN
+	$ btfs pin add -r=false QmZULkCELmmk5XNfCgTnCyFgAVxBRBXyDHGGMVoLFLiXEN
 	pinned QmZULkCELmmk5XNfCgTnCyFgAVxBRBXyDHGGMVoLFLiXEN directly
-	$ ipfs pin ls --type=direct
+	$ btfs pin ls --type=direct
 	QmZULkCELmmk5XNfCgTnCyFgAVxBRBXyDHGGMVoLFLiXEN direct
-	$ ipfs pin ls QmZULkCELmmk5XNfCgTnCyFgAVxBRBXyDHGGMVoLFLiXEN
+	$ btfs pin ls QmZULkCELmmk5XNfCgTnCyFgAVxBRBXyDHGGMVoLFLiXEN
 	QmZULkCELmmk5XNfCgTnCyFgAVxBRBXyDHGGMVoLFLiXEN direct
 `,
 	},
diff --git a/core/commands/ping.go b/core/commands/ping.go
index 43e2a7470..84f1f67a3 100644
--- a/core/commands/ping.go
+++ b/core/commands/ping.go
@@ -36,9 +36,9 @@ var ErrPingSelf = errors.New("error: can't ping self")
 
 var PingCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
-		Tagline: "Send echo request packets to IPFS hosts.",
+		Tagline: "Send echo request packets to BTFS hosts.",
 		ShortDescription: `
-'ipfs ping' is a tool to test sending data to other nodes. It finds nodes
+'btfs ping' is a tool to test sending data to other nodes. It finds nodes
 via the routing system, sends pings, waits for pongs, and prints out round-
 trip latency information.
 		`,
diff --git a/core/commands/pubsub.go b/core/commands/pubsub.go
index 52d78b123..cec0e45b5 100644
--- a/core/commands/pubsub.go
+++ b/core/commands/pubsub.go
@@ -17,9 +17,9 @@ import (
 
 var PubsubCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
-		Tagline: "An experimental publish-subscribe system on ipfs.",
+		Tagline: "An experimental publish-subscribe system on btfs.",
 		ShortDescription: `
-ipfs pubsub allows you to publish messages to a given topic, and also to
+btfs pubsub allows you to publish messages to a given topic, and also to
 subscribe to new messages on a given topic.
 
 This is an experimental feature. It is not intended in its current state
@@ -51,7 +51,7 @@ var PubsubSubCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
 		Tagline: "Subscribe to messages on a given topic.",
 		ShortDescription: `
-ipfs pubsub sub subscribes to messages on a given topic.
+btfs pubsub sub subscribes to messages on a given topic.
 
 This is an experimental feature. It is not intended in its current state
 to be used in a production environment.
@@ -59,7 +59,7 @@ to be used in a production environment.
 To use, the daemon must be run with '--enable-pubsub-experiment'.
 `,
 		LongDescription: `
-ipfs pubsub sub subscribes to messages on a given topic.
+btfs pubsub sub subscribes to messages on a given topic.
 
 This is an experimental feature. It is not intended in its current state
 to be used in a production environment.
@@ -140,7 +140,7 @@ var PubsubPubCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
 		Tagline: "Publish a message to a given pubsub topic.",
 		ShortDescription: `
-ipfs pubsub pub publishes a message to a specified topic.
+btfs pubsub pub publishes a message to a specified topic.
 
 This is an experimental feature. It is not intended in its current state
 to be used in a production environment.
@@ -179,7 +179,7 @@ var PubsubLsCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
 		Tagline: "List subscribed topics by name.",
 		ShortDescription: `
-ipfs pubsub ls lists out the names of topics you are currently subscribed to.
+btfs pubsub ls lists out the names of topics you are currently subscribed to.
 
 This is an experimental feature. It is not intended in its current state
 to be used in a production environment.
@@ -220,7 +220,7 @@ var PubsubPeersCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
 		Tagline: "List peers we are currently pubsubbing with.",
 		ShortDescription: `
-ipfs pubsub peers with no arguments lists out the pubsub peers you are
+btfs pubsub peers with no arguments lists out the pubsub peers you are
 currently connected to. If given a topic, it will list connected
 peers who are subscribed to the named topic.
 
diff --git a/core/commands/refs.go b/core/commands/refs.go
index d63786f87..c86d76140 100644
--- a/core/commands/refs.go
+++ b/core/commands/refs.go
@@ -42,12 +42,12 @@ const (
 	refsMaxDepthOptionName  = "max-depth"
 )
 
-// RefsCmd is the `ipfs refs` command
+// RefsCmd is the `btfs refs` command
 var RefsCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
 		Tagline: "List links (references) from an object.",
 		ShortDescription: `
-Lists the hashes of all the links an IPFS or IPNS object(s) contains,
+Lists the hashes of all the links an BTFS or BTNS object(s) contains,
 with the following format:
 
   <link base58 hash>
diff --git a/core/commands/repo.go b/core/commands/repo.go
index f7b431603..ef4601e03 100644
--- a/core/commands/repo.go
+++ b/core/commands/repo.go
@@ -30,9 +30,9 @@ type RepoVersion struct {
 
 var RepoCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
-		Tagline: "Manipulate the IPFS repo.",
+		Tagline: "Manipulate the BTFS repo.",
 		ShortDescription: `
-'ipfs repo' is a plumbing command used to manipulate the repo.
+'btfs repo' is a plumbing command used to manipulate the repo.
 `,
 	},
 
@@ -60,7 +60,7 @@ var repoGcCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
 		Tagline: "Perform a garbage collection sweep on the repo.",
 		ShortDescription: `
-'ipfs repo gc' is a plumbing command that will sweep the local
+'btfs repo gc' is a plumbing command that will sweep the local
 set of stored objects and remove ones that are not pinned in
 order to reclaim hard disk space.
 `,
@@ -140,7 +140,7 @@ var repoStatCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
 		Tagline: "Get stats for the currently used repo.",
 		ShortDescription: `
-'ipfs repo stat' provides information about the local set of
+'btfs repo stat' provides information about the local set of
 stored objects. It outputs:
 
 RepoSize        int Size in bytes that the repo is currently taking.
@@ -217,8 +217,8 @@ var repoFsckCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
 		Tagline: "Remove repo lockfiles.",
 		ShortDescription: `
-'ipfs repo fsck' is a plumbing command that will remove repo and level db
-lockfiles, as well as the api file. This command can only run when no ipfs
+'btfs repo fsck' is a plumbing command that will remove repo and level db
+lockfiles, as well as the api file. This command can only run when no btfs
 daemons are running.
 `,
 	},
@@ -380,7 +380,7 @@ var repoVersionCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
 		Tagline: "Show the repo version.",
 		ShortDescription: `
-'ipfs repo version' returns the current repo version.
+'btfs repo version' returns the current repo version.
 `,
 	},
 
@@ -400,7 +400,7 @@ var repoVersionCmd = &cmds.Command{
 			if quiet {
 				fmt.Fprintf(w, "fs-repo@%s\n", out.Version)
 			} else {
-				fmt.Fprintf(w, "ipfs repo version fs-repo@%s\n", out.Version)
+				fmt.Fprintf(w, "btfs repo version fs-repo@%s\n", out.Version)
 			}
 			return nil
 		}),
diff --git a/core/commands/resolve.go b/core/commands/resolve.go
index 9199934cb..9517ab322 100644
--- a/core/commands/resolve.go
+++ b/core/commands/resolve.go
@@ -28,7 +28,7 @@ const (
 
 var ResolveCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
-		Tagline: "Resolve the value of names to IPFS.",
+		Tagline: "Resolve the value of names to BTFS.",
 		ShortDescription: `
 There are a number of mutable name protocols that can link among
 themselves and into IPNS. This command accepts any of these
@@ -37,31 +37,31 @@ identifiers and resolves them to the referenced item.
 		LongDescription: `
 There are a number of mutable name protocols that can link among
 themselves and into IPNS. For example IPNS references can (currently)
-point at an IPFS object, and DNS links can point at other DNS links, IPNS
-entries, or IPFS objects. This command accepts any of these
+point at an BTFS object, and DNS links can point at other DNS links, IPNS
+entries, or BTFS objects. This command accepts any of these
 identifiers and resolves them to the referenced item.
 
 EXAMPLES
 
 Resolve the value of your identity:
 
-  $ ipfs resolve /ipns/QmatmE9msSfkKxoffpHwNLNKgwZG8eT9Bud6YoPab52vpy
-  /ipfs/Qmcqtw8FfrVSBaRmbWwHxt3AuySBhJLcvmFYi3Lbc4xnwj
+  $ btfs resolve /ipns/QmatmE9msSfkKxoffpHwNLNKgwZG8eT9Bud6YoPab52vpy
+  /btfs/Qmcqtw8FfrVSBaRmbWwHxt3AuySBhJLcvmFYi3Lbc4xnwj
 
 Resolve the value of another name:
 
-  $ ipfs resolve /ipns/QmbCMUZw6JFeZ7Wp9jkzbye3Fzp2GGcPgC3nmeUjfVF87n
+  $ btfs resolve /ipns/QmbCMUZw6JFeZ7Wp9jkzbye3Fzp2GGcPgC3nmeUjfVF87n
   /ipns/QmatmE9msSfkKxoffpHwNLNKgwZG8eT9Bud6YoPab52vpy
 
 Resolve the value of another name recursively:
 
-  $ ipfs resolve -r /ipns/QmbCMUZw6JFeZ7Wp9jkzbye3Fzp2GGcPgC3nmeUjfVF87n
-  /ipfs/Qmcqtw8FfrVSBaRmbWwHxt3AuySBhJLcvmFYi3Lbc4xnwj
+  $ btfs resolve -r /ipns/QmbCMUZw6JFeZ7Wp9jkzbye3Fzp2GGcPgC3nmeUjfVF87n
+  /btfs/Qmcqtw8FfrVSBaRmbWwHxt3AuySBhJLcvmFYi3Lbc4xnwj
 
-Resolve the value of an IPFS DAG path:
+Resolve the value of an BTFS DAG path:
 
-  $ ipfs resolve /ipfs/QmeZy1fGbwgVSrqbfh9fKQrAWgeyRnj7h8fsHS1oy3k99x/beep/boop
-  /ipfs/QmYRMjyvAiHKN9UTi8Bzt1HUspmSRD8T8DwxfSMzLgBon1
+  $ btfs resolve /btfs/QmeZy1fGbwgVSrqbfh9fKQrAWgeyRnj7h8fsHS1oy3k99x/beep/boop
+  /btfs/QmYRMjyvAiHKN9UTi8Bzt1HUspmSRD8T8DwxfSMzLgBon1
 
 `,
 	},
@@ -70,7 +70,7 @@ Resolve the value of an IPFS DAG path:
 		cmdkit.StringArg("name", true, false, "The name to resolve.").EnableStdin(),
 	},
 	Options: []cmdkit.Option{
-		cmdkit.BoolOption(resolveRecursiveOptionName, "r", "Resolve until the result is an IPFS name.").WithDefault(true),
+		cmdkit.BoolOption(resolveRecursiveOptionName, "r", "Resolve until the result is an BTFS name.").WithDefault(true),
 		cmdkit.IntOption(resolveDhtRecordCountOptionName, "dhtrc", "Number of records to request for DHT resolution."),
 		cmdkit.StringOption(resolveDhtTimeoutOptionName, "dhtt", "Max time to collect values during DHT resolution eg \"30s\". Pass 0 for no timeout."),
 	},
@@ -129,7 +129,7 @@ Resolve the value of an IPFS DAG path:
 			return cmds.EmitOnce(res, &ncmd.ResolvedPath{Path: path.Path(p.String())})
 		}
 
-		// else, ipfs path or ipns with recursive flag
+		// else, btfs path or ipns with recursive flag
 		p, err := coreiface.ParsePath(name)
 		if err != nil {
 			return err
diff --git a/core/commands/root.go b/core/commands/root.go
index 0286c5ec5..3645eb1be 100644
--- a/core/commands/root.go
+++ b/core/commands/root.go
@@ -109,7 +109,7 @@ The CLI will exit with one of the following values:
 	},
 }
 
-// commandsDaemonCmd is the "ipfs commands" command for daemon
+// commandsDaemonCmd is the "btfs commands" command for daemon
 var CommandsDaemonCmd = CommandsCmd(Root)
 
 var rootSubcommands = map[string]*cmds.Command{
@@ -157,10 +157,10 @@ var RootRO = &cmds.Command{}
 
 var CommandsDaemonROCmd = CommandsCmd(RootRO)
 
-// RefsROCmd is `ipfs refs` command
+// RefsROCmd is `btfs refs` command
 var RefsROCmd = &cmds.Command{}
 
-// VersionROCmd is `ipfs version` command (without deps).
+// VersionROCmd is `btfs version` command (without deps).
 var VersionROCmd = &cmds.Command{}
 
 var rootROSubcommands = map[string]*cmds.Command{
diff --git a/core/commands/shutdown.go b/core/commands/shutdown.go
index 4a6d44dd4..33ea9e56d 100644
--- a/core/commands/shutdown.go
+++ b/core/commands/shutdown.go
@@ -9,7 +9,7 @@ import (
 
 var daemonShutdownCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
-		Tagline: "Shut down the ipfs daemon",
+		Tagline: "Shut down the btfs daemon",
 	},
 	Run: func(req *cmds.Request, re cmds.ResponseEmitter, env cmds.Environment) error {
 		nd, err := cmdenv.GetNode(env)
@@ -22,7 +22,7 @@ var daemonShutdownCmd = &cmds.Command{
 		}
 
 		if err := nd.Process().Close(); err != nil {
-			log.Error("error while shutting down ipfs daemon:", err)
+			log.Error("error while shutting down btfs daemon:", err)
 		}
 
 		return nil
diff --git a/core/commands/stat.go b/core/commands/stat.go
index 3755d83c5..66da48592 100644
--- a/core/commands/stat.go
+++ b/core/commands/stat.go
@@ -18,12 +18,12 @@ import (
 
 var StatsCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
-		Tagline: "Query IPFS statistics.",
-		ShortDescription: `'ipfs stats' is a set of commands to help look at statistics
-for your IPFS node.
+		Tagline: "Query BTFS statistics.",
+		ShortDescription: `'btfs stats' is a set of commands to help look at statistics
+for your BTFS node.
 `,
-		LongDescription: `'ipfs stats' is a set of commands to help look at statistics
-for your IPFS node.`,
+		LongDescription: `'btfs stats' is a set of commands to help look at statistics
+for your BTFS node.`,
 	},
 
 	Subcommands: map[string]*cmds.Command{
@@ -42,11 +42,11 @@ const (
 
 var statBwCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
-		Tagline: "Print ipfs bandwidth information.",
-		ShortDescription: `'ipfs stats bw' prints bandwidth information for the ipfs daemon.
+		Tagline: "Print btfs bandwidth information.",
+		ShortDescription: `'btfs stats bw' prints bandwidth information for the btfs daemon.
 It displays: TotalIn, TotalOut, RateIn, RateOut.
 		`,
-		LongDescription: `'ipfs stats bw' prints bandwidth information for the ipfs daemon.
+		LongDescription: `'btfs stats bw' prints bandwidth information for the btfs daemon.
 It displays: TotalIn, TotalOut, RateIn, RateOut.
 
 By default, overall bandwidth and all protocols are shown. To limit bandwidth
@@ -69,7 +69,7 @@ Example:
     TotalOut: 0B
     RateIn: 343B/s
     RateOut: 0B/s
-    > ipfs stats bw -p QmepgFW7BHEtU4pZJdxaNiv75mKLLRQnPi1KaaXmQN4V1a
+    > btfs stats bw -p QmepgFW7BHEtU4pZJdxaNiv75mKLLRQnPi1KaaXmQN4V1a
     Bandwidth
     TotalIn: 4.9MB
     TotalOut: 12MB
diff --git a/core/commands/swarm.go b/core/commands/swarm.go
index 68edd8003..97aa9ccb8 100644
--- a/core/commands/swarm.go
+++ b/core/commands/swarm.go
@@ -44,9 +44,9 @@ var SwarmCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
 		Tagline: "Interact with the swarm.",
 		ShortDescription: `
-'ipfs swarm' is a tool to manipulate the network swarm. The swarm is the
+'btfs swarm' is a tool to manipulate the network swarm. The swarm is the
 component that opens, listens for, and maintains connections to other
-ipfs peers in the internet.
+btfs peers in the internet.
 `,
 	},
 	Subcommands: map[string]*cmds.Command{
@@ -69,7 +69,7 @@ var swarmPeersCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
 		Tagline: "List peers with open connections.",
 		ShortDescription: `
-'ipfs swarm peers' lists the set of peers this node is connected to.
+'btfs swarm peers' lists the set of peers this node is connected to.
 `,
 	},
 	Options: []cmdkit.Option{
@@ -221,7 +221,7 @@ var swarmAddrsCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
 		Tagline: "List known addresses. Useful for debugging.",
 		ShortDescription: `
-'ipfs swarm addrs' lists all addresses this node is aware of.
+'btfs swarm addrs' lists all addresses this node is aware of.
 `,
 	},
 	Subcommands: map[string]*cmds.Command{
@@ -276,7 +276,7 @@ var swarmAddrsLocalCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
 		Tagline: "List local addresses.",
 		ShortDescription: `
-'ipfs swarm addrs local' lists all local listening addresses announced to the network.
+'btfs swarm addrs local' lists all local listening addresses announced to the network.
 `,
 	},
 	Options: []cmdkit.Option{
@@ -320,7 +320,7 @@ var swarmAddrsListenCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
 		Tagline: "List interface listening addresses.",
 		ShortDescription: `
-'ipfs swarm addrs listen' lists all interface addresses the node is listening on.
+'btfs swarm addrs listen' lists all interface addresses the node is listening on.
 `,
 	},
 	Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
@@ -352,11 +352,11 @@ var swarmConnectCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
 		Tagline: "Open connection to a given address.",
 		ShortDescription: `
-'ipfs swarm connect' opens a new direct connection to a peer address.
+'btfs swarm connect' opens a new direct connection to a peer address.
 
-The address format is an IPFS multiaddr:
+The address format is an BTFS multiaddr:
 
-ipfs swarm connect /ip4/104.131.131.82/tcp/4001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ
+btfs swarm connect /ip4/104.131.131.82/tcp/4001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ
 `,
 	},
 	Arguments: []cmdkit.Argument{
@@ -398,12 +398,12 @@ var swarmDisconnectCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
 		Tagline: "Close connection to a given address.",
 		ShortDescription: `
-'ipfs swarm disconnect' closes a connection to a peer address. The address
-format is an IPFS multiaddr:
+'btfs swarm disconnect' closes a connection to a peer address. The address
+format is an BTFS multiaddr:
 
-ipfs swarm disconnect /ip4/104.131.131.82/tcp/4001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ
+btfs swarm disconnect /ip4/104.131.131.82/tcp/4001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ
 
-The disconnect is not permanent; if ipfs needs to talk to that address later,
+The disconnect is not permanent; if btfs needs to talk to that address later,
 it will reconnect.
 `,
 	},
@@ -538,7 +538,7 @@ func resolveAddresses(ctx context.Context, addrs []string) ([]ma.Multiaddr, erro
 				}
 			}
 			if found == 0 {
-				resolveErrC <- fmt.Errorf("found no ipfs peers at %s", maddr)
+				resolveErrC <- fmt.Errorf("found no btfs peers at %s", maddr)
 			}
 		}(maddr)
 	}
@@ -564,7 +564,7 @@ var swarmFiltersCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
 		Tagline: "Manipulate address filters.",
 		ShortDescription: `
-'ipfs swarm filters' will list out currently applied filters. Its subcommands
+'btfs swarm filters' will list out currently applied filters. Its subcommands
 can be used to add or remove said filters. Filters are specified using the
 multiaddr-filter format:
 
@@ -619,9 +619,9 @@ var swarmFiltersAddCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
 		Tagline: "Add an address filter.",
 		ShortDescription: `
-'ipfs swarm filters add' will add an address filter to the daemons swarm.
+'btfs swarm filters add' will add an address filter to the daemons swarm.
 Filters applied this way will not persist daemon reboots, to achieve that,
-add your filters to the ipfs config file.
+add your filters to the btfs config file.
 `,
 	},
 	Arguments: []cmdkit.Argument{
@@ -683,9 +683,9 @@ var swarmFiltersRmCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
 		Tagline: "Remove an address filter.",
 		ShortDescription: `
-'ipfs swarm filters rm' will remove an address filter from the daemons swarm.
+'btfs swarm filters rm' will remove an address filter from the daemons swarm.
 Filters removed this way will not persist daemon reboots, to achieve that,
-remove your filters from the ipfs config file.
+remove your filters from the btfs config file.
 `,
 	},
 	Arguments: []cmdkit.Argument{
diff --git a/core/commands/tar.go b/core/commands/tar.go
index 488193f18..37f83583d 100644
--- a/core/commands/tar.go
+++ b/core/commands/tar.go
@@ -16,7 +16,7 @@ import (
 
 var TarCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
-		Tagline: "Utility functions for tar files in ipfs.",
+		Tagline: "Utility functions for tar files in btfs.",
 	},
 
 	Subcommands: map[string]*cmds.Command{
@@ -27,9 +27,9 @@ var TarCmd = &cmds.Command{
 
 var tarAddCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
-		Tagline: "Import a tar file into ipfs.",
+		Tagline: "Import a tar file into btfs.",
 		ShortDescription: `
-'ipfs tar add' will parse a tar file and create a merkledag structure to
+'btfs tar add' will parse a tar file and create a merkledag structure to
 represent it.
 `,
 	},
@@ -77,14 +77,14 @@ represent it.
 
 var tarCatCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
-		Tagline: "Export a tar file from IPFS.",
+		Tagline: "Export a tar file from BTFS.",
 		ShortDescription: `
-'ipfs tar cat' will export a tar file from a previously imported one in IPFS.
+'btfs tar cat' will export a tar file from a previously imported one in BTFS.
 `,
 	},
 
 	Arguments: []cmdkit.Argument{
-		cmdkit.StringArg("path", true, false, "ipfs path of archive to export.").EnableStdin(),
+		cmdkit.StringArg("path", true, false, "btfs path of archive to export.").EnableStdin(),
 	},
 	Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
 		nd, err := cmdenv.GetNode(env)
diff --git a/core/commands/urlstore.go b/core/commands/urlstore.go
index 2844820a9..9b7da9f72 100644
--- a/core/commands/urlstore.go
+++ b/core/commands/urlstore.go
@@ -32,13 +32,13 @@ var urlAdd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
 		Tagline: "Add URL via urlstore.",
 		LongDescription: `
-Add URLs to ipfs without storing the data locally.
+Add URLs to btfs without storing the data locally.
 
 The URL provided must be stable and ideally on a web server under your
 control.
 
 The file is added using raw-leaves but otherwise using the default
-settings for 'ipfs add'.
+settings for 'btfs add'.
 
 This command is considered temporary until a better solution can be
 found.  It may disappear or the semantics can change at any
@@ -50,7 +50,7 @@ time.
 		cmdkit.BoolOption(pinOptionName, "Pin this object when adding.").WithDefault(true),
 	},
 	Arguments: []cmdkit.Argument{
-		cmdkit.StringArg("url", true, false, "URL to add to IPFS"),
+		cmdkit.StringArg("url", true, false, "URL to add to BTFS"),
 	},
 	Type: &BlockStat{},
 
diff --git a/core/commands/version.go b/core/commands/version.go
index 291f5699f..0cc51a6b5 100644
--- a/core/commands/version.go
+++ b/core/commands/version.go
@@ -31,8 +31,8 @@ const (
 
 var VersionCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
-		Tagline:          "Show ipfs version information.",
-		ShortDescription: "Returns the current version of ipfs and exits.",
+		Tagline:          "Show btfs version information.",
+		ShortDescription: "Returns the current version of btfs and exits.",
 	},
 	Subcommands: map[string]*cmds.Command{
 		"deps": depsVersionCommand,
@@ -63,7 +63,7 @@ var VersionCmd = &cmds.Command{
 
 			all, _ := req.Options[versionAllOptionName].(bool)
 			if all {
-				out := fmt.Sprintf("go-ipfs version: %s-%s\n"+
+				out := fmt.Sprintf("go-btfs version: %s-%s\n"+
 					"Repo version: %s\nSystem version: %s\nGolang version: %s\n",
 					version.Version, version.Commit, version.Repo, version.System, version.Golang)
 				fmt.Fprint(w, out)
@@ -82,7 +82,7 @@ var VersionCmd = &cmds.Command{
 				return nil
 			}
 
-			fmt.Fprint(w, fmt.Sprintf("ipfs version %s%s\n", version.Version, commitTxt))
+			fmt.Fprint(w, fmt.Sprintf("btfs version %s%s\n", version.Version, commitTxt))
 			return nil
 		}),
 	},
diff --git a/core/core.go b/core/core.go
index e3e3ccc01..4e27101b9 100644
--- a/core/core.go
+++ b/core/core.go
@@ -3,7 +3,7 @@ Package core implements the IpfsNode object and related methods.
 
 Packages underneath core/ provide a (relatively) stable, low-level API
 to carry out most IPFS-related tasks.  For more details on the other
-interfaces and how core/... fits into the bigger IPFS picture, see:
+interfaces and how core/... fits into the bigger BTFS picture, see:
 
   $ godoc github.com/ipfs/go-ipfs
 */
@@ -766,10 +766,10 @@ func (n *IpfsNode) loadID() error {
 
 	cid := cfg.Identity.PeerID
 	if cid == "" {
-		return errors.New("identity was not set in config (was 'ipfs init' run?)")
+		return errors.New("identity was not set in config (was 'btfs init' run?)")
 	}
 	if len(cid) == 0 {
-		return errors.New("no peer ID in config! (was 'ipfs init' run?)")
+		return errors.New("no peer ID in config! (was 'btfs init' run?)")
 	}
 
 	id, err := peer.IDB58Decode(cid)
diff --git a/core/corehttp/commands.go b/core/corehttp/commands.go
index 5ddfb9d80..1638ccc2b 100644
--- a/core/corehttp/commands.go
+++ b/core/corehttp/commands.go
@@ -30,8 +30,8 @@ This functionality is deprecated, and will be removed in future versions.
 Instead, try either adding headers to the config, or passing them via
 cli arguments:
 
-	ipfs config API.HTTPHeaders --json '{"Access-Control-Allow-Origin": ["*"]}'
-	ipfs daemon
+	btfs config API.HTTPHeaders --json '{"Access-Control-Allow-Origin": ["*"]}'
+	btfs daemon
 `
 
 // APIPath is the path at which the API is mounted.
@@ -153,7 +153,7 @@ func CommandsROOption(cctx oldcmds.Context) ServeOption {
 	return commandsOption(cctx, corecommands.RootRO)
 }
 
-// CheckVersionOption returns a ServeOption that checks whether the client ipfs version matches. Does nothing when the user agent string does not contain `/go-ipfs/`
+// CheckVersionOption returns a ServeOption that checks whether the client btfs version matches. Does nothing when the user agent string does not contain `/go-ipfs/`
 func CheckVersionOption() ServeOption {
 	daemonVersion := version.ApiVersion
 
diff --git a/core/corehttp/proxy.go b/core/corehttp/proxy.go
index b0579cb93..9a8b13f10 100644
--- a/core/corehttp/proxy.go
+++ b/core/corehttp/proxy.go
@@ -14,7 +14,7 @@ import (
 	protocol "github.com/libp2p/go-libp2p-protocol"
 )
 
-// ProxyOption is an endpoint for proxying a HTTP request to another ipfs peer
+// ProxyOption is an endpoint for proxying a HTTP request to another btfs peer
 func ProxyOption() ServeOption {
 	return func(ipfsNode *core.IpfsNode, _ net.Listener, mux *http.ServeMux) (*http.ServeMux, error) {
 		mux.HandleFunc("/p2p/", func(w http.ResponseWriter, request *http.Request) {
diff --git a/core/corerepo/gc.go b/core/corerepo/gc.go
index 3a75efab6..21ac83542 100644
--- a/core/corerepo/gc.go
+++ b/core/corerepo/gc.go
@@ -224,7 +224,7 @@ func (gc *GC) maybeGC(ctx context.Context, offset uint64) error {
 		if err := GarbageCollect(gc.Node, ctx); err != nil {
 			return err
 		}
-		log.Infof("Repo GC done. See `ipfs repo stat` to see how much space got freed.\n")
+		log.Infof("Repo GC done. See `btfs repo stat` to see how much space got freed.\n")
 	}
 	return nil
 }
diff --git a/core/pathresolver.go b/core/pathresolver.go
index 62e009522..8e2317986 100644
--- a/core/pathresolver.go
+++ b/core/pathresolver.go
@@ -13,7 +13,7 @@ import (
 	resolver "github.com/ipfs/go-path/resolver"
 )
 
-// ErrNoNamesys is an explicit error for when an IPFS node doesn't
+// ErrNoNamesys is an explicit error for when an BTFS node doesn't
 // (yet) have a name system
 var ErrNoNamesys = errors.New(
 	"core/resolve: no Namesys on IpfsNode - can't resolve btns entry")
@@ -62,7 +62,7 @@ func ResolveIPNS(ctx context.Context, nsys namesys.NameSystem, p path.Path) (pat
 }
 
 // Resolve resolves the given path by parsing out protocol-specific
-// entries (e.g. /btns/<node-key>) and then going through the /ipfs/
+// entries (e.g. /btns/<node-key>) and then going through the /btfs/
 // entries and returning the final node.
 func Resolve(ctx context.Context, nsys namesys.NameSystem, r *resolver.Resolver, p path.Path) (ipld.Node, error) {
 	p, err := ResolveIPNS(ctx, nsys, p)
@@ -70,6 +70,6 @@ func Resolve(ctx context.Context, nsys namesys.NameSystem, r *resolver.Resolver,
 		return nil, err
 	}
 
-	// ok, we have an IPFS path now (or what we'll treat as one)
+	// ok, we have an BTFS path now (or what we'll treat as one)
 	return r.ResolvePath(ctx, p)
 }
diff --git a/fuse/ipns/ipns_unix.go b/fuse/ipns/ipns_unix.go
index 9c6935a5b..0dfbd69f2 100644
--- a/fuse/ipns/ipns_unix.go
+++ b/fuse/ipns/ipns_unix.go
@@ -195,7 +195,7 @@ func (s *Root) Lookup(ctx context.Context, name string) (fs.Node, error) {
 		}
 	}
 
-	// other links go through ipns resolution and are symlinked into the ipfs mountpoint
+	// other links go through btns resolution and are symlinked into the btfs mountpoint
 	ipnsName := "/btns/" + name
 	resolved, err := s.Ipfs.Namesys.Resolve(s.Ipfs.Context(), ipnsName)
 	if err != nil {
diff --git a/fuse/node/mount_darwin.go b/fuse/node/mount_darwin.go
index 9172a7273..d95f467e3 100644
--- a/fuse/node/mount_darwin.go
+++ b/fuse/node/mount_darwin.go
@@ -76,10 +76,10 @@ Please install it yourself by running:
 
 	go get %s
 
-You can also stop ipfs from running these checks and use whatever OSXFUSE
+You can also stop btfs from running these checks and use whatever OSXFUSE
 version you have by running:
 
-	ipfs config --bool %s true
+	btfs config --bool %s true
 
 [1]: https://github.com/ipfs/go-ipfs/issues/177
 [2]: https://github.com/ipfs/go-ipfs/pull/533
@@ -107,10 +107,10 @@ You should see something like this:
 	fuse-version -only agent
 	OSXFUSE.AgentVersion: 2.7.3
 
-Just make sure the number is 2.7.2 or higher. You can then stop ipfs from
+Just make sure the number is 2.7.2 or higher. You can then stop btfs from
 trying to run these checks with:
 
-	ipfs config --bool %s true
+	btfs config --bool %s true
 
 [1]: https://github.com/ipfs/go-ipfs/issues/177
 [2]: https://github.com/ipfs/go-ipfs/pull/533
@@ -120,7 +120,7 @@ trying to run these checks with:
 var errStrFixConfig = `config key invalid: %s %v
 You may be able to get this error to go away by setting it again:
 
-	ipfs config --bool %s true
+	btfs config --bool %s true
 
 Either way, please tell us at: http://github.com/ipfs/go-ipfs/issues
 `
diff --git a/namesys/dns.go b/namesys/dns.go
index 931edec00..e7c599b38 100644
--- a/namesys/dns.go
+++ b/namesys/dns.go
@@ -131,7 +131,7 @@ func workDomain(r *DNSResolver, name string, res chan lookupRes) {
 }
 
 func parseEntry(txt string) (path.Path, error) {
-	p, err := path.ParseCidToPath(txt) // bare IPFS multihashes
+	p, err := path.ParseCidToPath(txt) // bare BTFS multihashes
 	if err == nil {
 		return p, nil
 	}
diff --git a/pin/gc/gc.go b/pin/gc/gc.go
index 12b0fadb2..cc0328046 100644
--- a/pin/gc/gc.go
+++ b/pin/gc/gc.go
@@ -159,9 +159,9 @@ func Descendants(ctx context.Context, getLinks dag.GetLinks, set *cid.Set, roots
 	verboseCidError := func(err error) error {
 		if strings.Contains(err.Error(), verifcid.ErrBelowMinimumHashLength.Error()) ||
 			strings.Contains(err.Error(), verifcid.ErrPossiblyInsecureHashFunction.Error()) {
-			err = fmt.Errorf("\"%s\"\nPlease run 'ipfs pin verify'"+
+			err = fmt.Errorf("\"%s\"\nPlease run 'btfs pin verify'"+
 				" to list insecure hashes. If you want to read them,"+
-				" please downgrade your go-ipfs to 0.4.13\n", err)
+				" please downgrade your go-btfs to 0.4.13\n", err)
 			log.Error(err)
 		}
 		return err
diff --git a/repo/fsrepo/fsrepo.go b/repo/fsrepo/fsrepo.go
index d35c97140..06a728908 100644
--- a/repo/fsrepo/fsrepo.go
+++ b/repo/fsrepo/fsrepo.go
@@ -42,15 +42,15 @@ var migrationInstructions = `See https://github.com/ipfs/fs-repo-migrations/blob
 Sorry for the inconvenience. In the future, these will run automatically.`
 
 var programTooLowMessage = `Your programs version (%d) is lower than your repos (%d).
-Please update ipfs to a version that supports the existing repo, or run
+Please update btfs to a version that supports the existing repo, or run
 a migration in reverse.
 
 See https://github.com/ipfs/fs-repo-migrations/blob/master/run.md for details.`
 
 var (
 	ErrNoVersion     = errors.New("no version file found, please run 0-to-1 migration tool.\n" + migrationInstructions)
-	ErrOldRepo       = errors.New("ipfs repo found in old '~/.go-ipfs' location, please run migration tool.\n" + migrationInstructions)
-	ErrNeedMigration = errors.New("ipfs repo needs migration")
+	ErrOldRepo       = errors.New("btfs repo found in old '~/.go-btfs' location, please run migration tool.\n" + migrationInstructions)
+	ErrNeedMigration = errors.New("btfs repo needs migration")
 )
 
 type NoRepoError struct {
@@ -60,7 +60,7 @@ type NoRepoError struct {
 var _ error = NoRepoError{}
 
 func (err NoRepoError) Error() string {
-	return fmt.Sprintf("no IPFS repo found in %s.\nplease run: 'ipfs init'", err.Path)
+	return fmt.Sprintf("no BTFS repo found in %s.\nplease run: 'btfs init'", err.Path)
 }
 
 const apiFile = "api"
@@ -80,16 +80,16 @@ var (
 	// this can be removed. Right now, this makes ConfigCmd.Run
 	// function try to open the repo twice:
 	//
-	//     $ ipfs daemon &
-	//     $ ipfs config foo
+	//     $ btfs daemon &
+	//     $ btfs config foo
 	//
 	// The reason for the above is that in standalone mode without the
-	// daemon, `ipfs config` tries to save work by not building the
+	// daemon, `btfs config` tries to save work by not building the
 	// full IpfsNode, but accessing the Repo directly.
 	onlyOne repo.OnlyOne
 )
 
-// FSRepo represents an IPFS FileSystem Repo. It is safe for use by multiple
+// FSRepo represents an BTFS FileSystem Repo. It is safe for use by multiple
 // callers.
 type FSRepo struct {
 	// has Close been called already
diff --git a/tar/format.go b/tar/format.go
index 02fb4b2cd..5607f83dd 100644
--- a/tar/format.go
+++ b/tar/format.go
@@ -1,4 +1,4 @@
-package tarfmt
+ package tarfmt
 
 import (
 	"archive/tar"
@@ -200,7 +200,7 @@ func (tr *tarReader) Read(b []byte) (int, error) {
 // of ImportTar.
 func ExportTar(ctx context.Context, root *dag.ProtoNode, ds ipld.DAGService) (io.Reader, error) {
 	if string(root.Data()) != "ipfs/tar" {
-		return nil, errors.New("not an IPFS tarchive")
+		return nil, errors.New("not an BTFS tarchive")
 	}
 	return &tarReader{
 		links: root.Links(),