diff --git a/Manifest.txt b/Manifest.txt
index fcbf1a2..2c18e49 100644
--- a/Manifest.txt
+++ b/Manifest.txt
@@ -4,12 +4,14 @@ PostInstall.txt
 README.rdoc
 Rakefile
 bin/freckle
-freckle-gem.gemspec
-lib/freckle-gem.rb
-lib/freckle-gem/entry.rb
-lib/freckle-gem/project.rb
+freckle.gemspec
+lib/freckle.rb
 lib/freckle/app_config.rb
 lib/freckle/cli.rb
-test/test_=freckle_cli.rb
-test/test_freckle-gem.rb
+lib/freckle/entry.rb
+lib/freckle/project.rb
+script/console
+script/destroy
+script/generate
+test/test_freckle_cli.rb
 test/test_helper.rb
diff --git a/Rakefile b/Rakefile
index 3094c14..c598a2b 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,9 +1,9 @@
 %w[rubygems rake rake/clean fileutils newgem rubigen].each { |f| require f }
-require File.dirname(__FILE__) + '/lib/freckle-gem'
+require File.dirname(__FILE__) + '/lib/freckle'
 
 # Generate all the Rake tasks
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.new('freckle-gem', FreckleGem::VERSION) do |p|
+$hoe = Hoe.new('freckle', Freckle::VERSION) do |p|
   p.developer('Dieter Komendera', 'dieter@abloom.at')
   p.changes              = p.paragraphs_of("History.txt", 0..1).join("\n\n")
   p.post_install_message = 'PostInstall.txt'
diff --git a/test/test_=freckle_cli.rb b/test/test_freckle_cli.rb
similarity index 70%
rename from test/test_=freckle_cli.rb
rename to test/test_freckle_cli.rb
index 9cbbd83..99499ee 100644
--- a/test/test_=freckle_cli.rb
+++ b/test/test_freckle_cli.rb
@@ -1,10 +1,10 @@
 require File.join(File.dirname(__FILE__), "test_helper.rb")
-require '=freckle/cli'
+require 'freckle/cli'
 
-class Test=freckleCli < Test::Unit::TestCase
+class TestFreckleCli < Test::Unit::TestCase
   def setup
     @stdout_io = StringIO.new
-    =freckle::CLI.execute(@stdout_io, [])
+    Freckle::CLI.execute(@stdout_io, [])
     @stdout_io.rewind
     @stdout = @stdout_io.read
   end