diff --git a/composer.json b/composer.json
index e20d921f..196275fc 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "jigsaw/jigsaw",
+    "name": "tightenco/jigsaw",
     "description": "Simple static sites with Laravel's Blade.",
     "keywords": ["blade", "laravel", "static", "site", "generator"],
     "license": "MIT",
@@ -11,7 +11,7 @@
     ],
     "autoload": {
         "psr-4": {
-            "Jigsaw\\Jigsaw\\": "src"
+            "TightenCo\\Jigsaw\\": "src"
         }
     },
     "require": {
diff --git a/jigsaw b/jigsaw
index 9e9187a9..d3547bc7 100755
--- a/jigsaw
+++ b/jigsaw
@@ -8,14 +8,14 @@ use Illuminate\View\Engines\CompilerEngine;
 use Illuminate\View\Engines\EngineResolver;
 use Illuminate\View\Factory;
 use Illuminate\View\FileViewFinder;
-use Jigsaw\Jigsaw\Console\BuildCommand;
-use Jigsaw\Jigsaw\Console\InitCommand;
-use Jigsaw\Jigsaw\Filesystem;
-use Jigsaw\Jigsaw\Handlers\BladeHandler;
-use Jigsaw\Jigsaw\Handlers\DefaultHandler;
-use Jigsaw\Jigsaw\Handlers\MarkdownHandler;
-use Jigsaw\Jigsaw\Jigsaw;
-use Jigsaw\Jigsaw\TemporaryFilesystem;
+use TightenCo\Jigsaw\Console\BuildCommand;
+use TightenCo\Jigsaw\Console\InitCommand;
+use TightenCo\Jigsaw\Filesystem;
+use TightenCo\Jigsaw\Handlers\BladeHandler;
+use TightenCo\Jigsaw\Handlers\DefaultHandler;
+use TightenCo\Jigsaw\Handlers\MarkdownHandler;
+use TightenCo\Jigsaw\Jigsaw;
+use TightenCo\Jigsaw\TemporaryFilesystem;
 
 if (file_exists(__DIR__.'/vendor/autoload.php')) {
     require __DIR__.'/vendor/autoload.php';
diff --git a/src/Console/BuildCommand.php b/src/Console/BuildCommand.php
index 2cf5ff36..abfe76b3 100644
--- a/src/Console/BuildCommand.php
+++ b/src/Console/BuildCommand.php
@@ -1,6 +1,6 @@
-<?php namespace Jigsaw\Jigsaw\Console;
+<?php namespace TightenCo\Jigsaw\Console;
 
-use Jigsaw\Jigsaw\Jigsaw;
+use TightenCo\Jigsaw\Jigsaw;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
diff --git a/src/Console/Command.php b/src/Console/Command.php
index 456065ae..0efbbad1 100644
--- a/src/Console/Command.php
+++ b/src/Console/Command.php
@@ -1,6 +1,6 @@
-<?php namespace Jigsaw\Jigsaw\Console;
+<?php namespace TightenCo\Jigsaw\Console;
 
-use Jigsaw\Jigsaw\Jigsaw;
+use TightenCo\Jigsaw\Jigsaw;
 use Symfony\Component\Console\Command\Command as SymfonyCommand;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
diff --git a/src/Console/InitCommand.php b/src/Console/InitCommand.php
index c623697d..106c4b3f 100644
--- a/src/Console/InitCommand.php
+++ b/src/Console/InitCommand.php
@@ -1,6 +1,6 @@
-<?php namespace Jigsaw\Jigsaw\Console;
+<?php namespace TightenCo\Jigsaw\Console;
 
-use Jigsaw\Jigsaw\Filesystem;
+use TightenCo\Jigsaw\Filesystem;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
diff --git a/src/Filesystem.php b/src/Filesystem.php
index c720e7f6..3aa0a992 100644
--- a/src/Filesystem.php
+++ b/src/Filesystem.php
@@ -1,4 +1,4 @@
-<?php namespace Jigsaw\Jigsaw;
+<?php namespace TightenCo\Jigsaw;
 
 use Illuminate\Filesystem\Filesystem as BaseFilesystem;
 use Symfony\Component\Finder\Finder;
diff --git a/src/Handlers/BladeHandler.php b/src/Handlers/BladeHandler.php
index 5b21e72d..de4f6c65 100644
--- a/src/Handlers/BladeHandler.php
+++ b/src/Handlers/BladeHandler.php
@@ -1,7 +1,7 @@
-<?php namespace Jigsaw\Jigsaw\Handlers;
+<?php namespace TightenCo\Jigsaw\Handlers;
 
 use Illuminate\Contracts\View\Factory;
-use Jigsaw\Jigsaw\ProcessedFile;
+use TightenCo\Jigsaw\ProcessedFile;
 
 class BladeHandler
 {
diff --git a/src/Handlers/DefaultHandler.php b/src/Handlers/DefaultHandler.php
index 0644d456..6cf3a9b0 100644
--- a/src/Handlers/DefaultHandler.php
+++ b/src/Handlers/DefaultHandler.php
@@ -1,8 +1,8 @@
-<?php namespace Jigsaw\Jigsaw\Handlers;
+<?php namespace TightenCo\Jigsaw\Handlers;
 
 use Illuminate\Contracts\View\Factory;
-use Jigsaw\Jigsaw\Filesystem;
-use Jigsaw\Jigsaw\ProcessedFile;
+use TightenCo\Jigsaw\Filesystem;
+use TightenCo\Jigsaw\ProcessedFile;
 
 class DefaultHandler
 {
diff --git a/src/Handlers/MarkdownHandler.php b/src/Handlers/MarkdownHandler.php
index e3146abc..e8377dbd 100644
--- a/src/Handlers/MarkdownHandler.php
+++ b/src/Handlers/MarkdownHandler.php
@@ -1,7 +1,7 @@
-<?php namespace Jigsaw\Jigsaw\Handlers;
+<?php namespace TightenCo\Jigsaw\Handlers;
 
 use Illuminate\Contracts\View\Factory;
-use Jigsaw\Jigsaw\ProcessedFile;
+use TightenCo\Jigsaw\ProcessedFile;
 use Mni\FrontYAML\Parser;
 
 class MarkdownHandler
diff --git a/src/Jigsaw.php b/src/Jigsaw.php
index 86fedc63..85584344 100644
--- a/src/Jigsaw.php
+++ b/src/Jigsaw.php
@@ -1,8 +1,8 @@
-<?php namespace Jigsaw\Jigsaw;
+<?php namespace TightenCo\Jigsaw;
 
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Support\Str;
-use Jigsaw\Jigsaw\Filesystem;
+use TightenCo\Jigsaw\Filesystem;
 
 class Jigsaw
 {
diff --git a/src/ProcessedFile.php b/src/ProcessedFile.php
index 5214878c..0ff1b3c6 100644
--- a/src/ProcessedFile.php
+++ b/src/ProcessedFile.php
@@ -1,4 +1,4 @@
-<?php namespace Jigsaw\Jigsaw;
+<?php namespace TightenCo\Jigsaw;
 
 class ProcessedFile
 {
diff --git a/src/TemporaryFilesystem.php b/src/TemporaryFilesystem.php
index b001e151..285cccd7 100644
--- a/src/TemporaryFilesystem.php
+++ b/src/TemporaryFilesystem.php
@@ -1,4 +1,4 @@
-<?php namespace Jigsaw\Jigsaw;
+<?php namespace TightenCo\Jigsaw;
 
 use Illuminate\Support\Str;