diff --git a/bin/titan b/bin/titan
index 75316e8..f8c3f0f 100644
--- a/bin/titan
+++ b/bin/titan
@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 require "titan"
 
-Titan::Cli.start
+Titan::CLI.start
diff --git a/lib/titan.rb b/lib/titan.rb
index b316205..6dfb145 100644
--- a/lib/titan.rb
+++ b/lib/titan.rb
@@ -1,6 +1,6 @@
 require "titan/version"
 
 module Titan
-  autoload :Cli,      "titan/cli"
+  autoload :CLI,      "titan/cli"
   autoload :Thread,   "titan/thread"
 end
diff --git a/lib/titan/cli.rb b/lib/titan/cli.rb
index a6ebfc9..bd7a89b 100644
--- a/lib/titan/cli.rb
+++ b/lib/titan/cli.rb
@@ -1,7 +1,7 @@
 require "thor"
 
 module Titan
-  class Cli < Thor
+  class CLI < Thor
     include Thor::Actions
 
     def initialize(*)
diff --git a/spec/titan/cli_spec.rb b/spec/titan/cli_spec.rb
index f180ed3..e9040e9 100644
--- a/spec/titan/cli_spec.rb
+++ b/spec/titan/cli_spec.rb
@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe Titan::Cli do
+describe Titan::CLI do
   before(:each) do
     @shell = mock(Thor::Shell::Basic, :print_table => nil, :say => nil)
     Thor::Shell::Basic.stub!(:new).and_return(@shell)
-    @cli = Titan::Cli.new
+    @cli = Titan::CLI.new
   end
 
   describe "#help" do