diff --git a/.screenomat b/.screenomat
new file mode 100644
index 0000000..443ae5a
--- /dev/null
+++ b/.screenomat
@@ -0,0 +1,4 @@
+session do
+	screen! "bundle exec autotest", :title => 'autotest'
+	screen :title => 'command prompt'
+end
diff --git a/Gemfile.lock b/Gemfile.lock
index 91ccbd9..d2f6366 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    screenie (0.0.1)
+    screenomat (0.0.1)
 
 GEM
   remote: http://rubygems.org/
@@ -30,4 +30,4 @@ DEPENDENCIES
   bundler (>= 1.0.0)
   mocha
   rspec
-  screenie!
+  screenomat!
diff --git a/README.md b/README.md
index dc1819b..904de9d 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
-# screenie
+# screenomat
 
 You like screen, I like screen. Make getting those big multi-command line-running projects
-even easier to get started up with `screenie`.
+even easier to get started up with `screenomat`.
 
 ## How?
 
-Make a `.screenie` file in your app and write:
+Make a `.screenomat` file in your app and write:
 
 <pre>
 session do
@@ -19,7 +19,7 @@ end
 
 Then run:
 
-    screenie
+    screenomat
 
 _~~whoa~~_
 
@@ -43,23 +43,23 @@ end
 
 Then run:
 
-    screenie backend
+    screenomat backend
 
 or even:
 
-    screenie frontend
+    screenomat frontend
 
 ## Defaults?
 
-Like magic `screenie` bits anywhere? `~/.screenie` is what you want! Same syntax!
+Like magic `screenomat` bits anywhere? `~/.screenomat` is what you want! Same syntax!
 
 ## Ruby? DRY?
 
-Just like `Gemfile`, `*.gemspec`, and other modern Ruby things, `.screenie` is Ruby code. Like
+Just like `Gemfile`, `*.gemspec`, and other modern Ruby things, `.screenomat` is Ruby code. Like
 DRYing things? You can do it!
 
 <pre>
-class Screenie::DSL::Session
+class Screenomat::DSL::Session
   def whoa(&block)
     screen :title => "first"
     instance_eval(&block)
diff --git a/bin/screenie b/bin/screenomat
similarity index 78%
rename from bin/screenie
rename to bin/screenomat
index 9c77c75..d577691 100755
--- a/bin/screenie
+++ b/bin/screenomat
@@ -1,13 +1,13 @@
 #!which ruby
 
 require 'getoptlong'
-require 'screenie/dsl/builder'
+require 'screenomat/dsl/builder'
 
 opt = GetoptLong.new(
   [ '--input', '-i', GetoptLong::REQUIRED_ARGUMENT ]
 )
 
-files = %w{.screenie ~/.screenie}
+files = %w{.screenomat ~/.screenomat}
 
 opt.each do |key, value|
   case key
@@ -20,7 +20,7 @@ session_name = ARGV.shift
 
 files.each do |path|
   if File.exist?(target = File.expand_path(path))
-    sessions = Screenie::DSL::Builder.new(File.read(target))
+    sessions = Screenomat::DSL::Builder.new(File.read(target))
 
     if !session_name || session_name.empty?
       session = sessions.first
diff --git a/lib/screenie.rb b/lib/screenie.rb
deleted file mode 100644
index 9f9b6da..0000000
--- a/lib/screenie.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-module Screenie
-  
-end
\ No newline at end of file
diff --git a/lib/screenie/cli.rb b/lib/screenie/cli.rb
deleted file mode 100644
index e69de29..0000000
diff --git a/lib/screenomat.rb b/lib/screenomat.rb
new file mode 100644
index 0000000..1e91f86
--- /dev/null
+++ b/lib/screenomat.rb
@@ -0,0 +1,3 @@
+module Screenomat
+
+end
\ No newline at end of file
diff --git a/lib/screenie/dsl/builder.rb b/lib/screenomat/dsl/builder.rb
similarity index 91%
rename from lib/screenie/dsl/builder.rb
rename to lib/screenomat/dsl/builder.rb
index a0e865c..9d8ba33 100644
--- a/lib/screenie/dsl/builder.rb
+++ b/lib/screenomat/dsl/builder.rb
@@ -1,6 +1,6 @@
-require 'screenie/dsl/session'
+require 'screenomat/dsl/session'
 
-module Screenie
+module Screenomat
   module DSL
     class Builder
       attr_reader :sessions
diff --git a/lib/screenie/dsl/screen.rb b/lib/screenomat/dsl/screen.rb
similarity index 98%
rename from lib/screenie/dsl/screen.rb
rename to lib/screenomat/dsl/screen.rb
index 6ad8ff4..9f0797a 100644
--- a/lib/screenie/dsl/screen.rb
+++ b/lib/screenomat/dsl/screen.rb
@@ -1,4 +1,4 @@
-module Screenie
+module Screenomat
   module DSL
     class Screen
       attr_accessor :screen_id
diff --git a/lib/screenie/dsl/session.rb b/lib/screenomat/dsl/session.rb
similarity index 95%
rename from lib/screenie/dsl/session.rb
rename to lib/screenomat/dsl/session.rb
index b63fb08..1d1d2da 100644
--- a/lib/screenie/dsl/session.rb
+++ b/lib/screenomat/dsl/session.rb
@@ -1,6 +1,6 @@
-require 'screenie/dsl/screen'
+require 'screenomat/dsl/screen'
 
-module Screenie
+module Screenomat
   module DSL
     class Session
       attr_accessor :name
diff --git a/lib/screenie/version.rb b/lib/screenomat/version.rb
similarity index 57%
rename from lib/screenie/version.rb
rename to lib/screenomat/version.rb
index d67263d..17bbd65 100644
--- a/lib/screenie/version.rb
+++ b/lib/screenomat/version.rb
@@ -1,3 +1,3 @@
-module Screenie
+module Screenomat
   VERSION = '0.0.1'
 end
diff --git a/screenie.gemspec b/screenomat.gemspec
similarity index 83%
rename from screenie.gemspec
rename to screenomat.gemspec
index 08d67d7..33aa0c1 100644
--- a/screenie.gemspec
+++ b/screenomat.gemspec
@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path("../lib/screenie/version", __FILE__)
+require File.expand_path("../lib/screenomat/version", __FILE__)
 
 Gem::Specification.new do |s|
-  s.name        = "screenie"
-  s.version     = Screenie::VERSION
+  s.name        = "screenomat"
+  s.version     = Screenomat::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = []
   s.email       = []
diff --git a/spec/lib/screenie/dsl/builder_spec.rb b/spec/lib/screenie/dsl/builder_spec.rb
deleted file mode 100644
index 7c02e05..0000000
--- a/spec/lib/screenie/dsl/builder_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require 'spec_helper'
-require 'screenie/dsl/builder'
-
-describe Screenie::DSL::Builder do
-  describe '#sessions' do
-    context 'from block' do
-      subject { Screenie::DSL::Builder.new { session("cats") {  } }}
-
-      specify { subject[:cats].should_not be_nil }
-    end
-
-    context 'from code' do
-      subject { Screenie::DSL::Builder.new(%{session("cats") {  } })}
-
-      specify { subject[:cats].should_not be_nil }
-    end
-  end
-
-  describe '#first' do
-    subject { Screenie::DSL::Builder.new { session do; end }}
-
-    its(:first) { should be_a_kind_of(Screenie::DSL::Session) }
-  end
-end
diff --git a/spec/lib/screenie_spec.rb b/spec/lib/screenie_spec.rb
deleted file mode 100644
index 9450438..0000000
--- a/spec/lib/screenie_spec.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'spec_helper'
-
-describe Screenie do
-
-end
\ No newline at end of file
diff --git a/spec/lib/screenomat/dsl/builder_spec.rb b/spec/lib/screenomat/dsl/builder_spec.rb
new file mode 100644
index 0000000..43f9a42
--- /dev/null
+++ b/spec/lib/screenomat/dsl/builder_spec.rb
@@ -0,0 +1,24 @@
+require 'spec_helper'
+require 'screenomat/dsl/builder'
+
+describe Screenomat::DSL::Builder do
+  describe '#sessions' do
+    context 'from block' do
+      subject { Screenomat::DSL::Builder.new { session("cats") {  } }}
+
+      specify { subject[:cats].should_not be_nil }
+    end
+
+    context 'from code' do
+      subject { Screenomat::DSL::Builder.new(%{session("cats") {  } })}
+
+      specify { subject[:cats].should_not be_nil }
+    end
+  end
+
+  describe '#first' do
+    subject { Screenomat::DSL::Builder.new { session do; end }}
+
+    its(:first) { should be_a_kind_of(Screenomat::DSL::Session) }
+  end
+end
diff --git a/spec/lib/screenie/dsl/screen_spec.rb b/spec/lib/screenomat/dsl/screen_spec.rb
similarity index 88%
rename from spec/lib/screenie/dsl/screen_spec.rb
rename to spec/lib/screenomat/dsl/screen_spec.rb
index d9c6f2f..7462387 100644
--- a/spec/lib/screenie/dsl/screen_spec.rb
+++ b/spec/lib/screenomat/dsl/screen_spec.rb
@@ -1,9 +1,9 @@
 require 'spec_helper'
-require 'screenie/dsl/screen'
+require 'screenomat/dsl/screen'
 
-describe Screenie::DSL::Screen do
+describe Screenomat::DSL::Screen do
   describe '#to_cmd' do
-    let(:screen) { Screenie::DSL::Screen.new(*params) }
+    let(:screen) { Screenomat::DSL::Screen.new(*params) }
 
     subject { screen }
 
diff --git a/spec/lib/screenie/dsl/session_spec.rb b/spec/lib/screenomat/dsl/session_spec.rb
similarity index 74%
rename from spec/lib/screenie/dsl/session_spec.rb
rename to spec/lib/screenomat/dsl/session_spec.rb
index 7c16d26..d8d978c 100644
--- a/spec/lib/screenie/dsl/session_spec.rb
+++ b/spec/lib/screenomat/dsl/session_spec.rb
@@ -1,11 +1,11 @@
 require 'spec_helper'
-require 'screenie/dsl/session'
+require 'screenomat/dsl/session'
 
-describe Screenie::DSL::Session do
+describe Screenomat::DSL::Session do
   describe '#to_cmd' do
     context 'one screen' do
       subject {
-        Screenie::DSL::Session.new("my-session") { screen "test" }.to_cmd
+        Screenomat::DSL::Session.new("my-session") { screen "test" }.to_cmd
       }
 
       it { should == [
@@ -18,7 +18,7 @@ describe Screenie::DSL::Session do
 
     context 'two screens' do
       subject {
-        Screenie::DSL::Session.new("my-session") { screen "test"; screen "test2" }.to_cmd
+        Screenomat::DSL::Session.new("my-session") { screen "test"; screen "test2" }.to_cmd
       }
 
       it { should == [
@@ -35,7 +35,7 @@ describe Screenie::DSL::Session do
 
   describe 'from string' do
     subject {
-      Screenie::DSL::Session.new("my-session", <<-EOR).to_cmd
+      Screenomat::DSL::Session.new("my-session", <<-EOR).to_cmd
 screen "test"
       EOR
     }
@@ -50,7 +50,7 @@ screen "test"
 
   describe 'screen!' do
     subject {
-      Screenie::DSL::Session.new("my-session") { screen "test"; screen! "test2" }.to_cmd
+      Screenomat::DSL::Session.new("my-session") { screen "test"; screen! "test2" }.to_cmd
     }
 
     it { should == [