diff --git a/lib/rubyx.rb b/lib/rubyx.rb
index dfc6204c..777d1c38 100644
--- a/lib/rubyx.rb
+++ b/lib/rubyx.rb
@@ -14,4 +14,4 @@ require "register/builtin/space"
 require "arm/arm_machine"
 require "arm/translator"
 
-require "melon/ruby_compiler"
+require "rubyx/ruby_compiler"
diff --git a/lib/melon/passes/locals_collector.rb b/lib/rubyx/passes/locals_collector.rb
similarity index 97%
rename from lib/melon/passes/locals_collector.rb
rename to lib/rubyx/passes/locals_collector.rb
index 3f76b810..eea9ba40 100644
--- a/lib/melon/passes/locals_collector.rb
+++ b/lib/rubyx/passes/locals_collector.rb
@@ -1,4 +1,4 @@
-module Melon
+module Rubyx
   module Passes
     class LocalsCollector < TotalProcessor
 
diff --git a/lib/melon/passes/method_collector.rb b/lib/rubyx/passes/method_collector.rb
similarity index 98%
rename from lib/melon/passes/method_collector.rb
rename to lib/rubyx/passes/method_collector.rb
index 7b3644c3..7df58338 100644
--- a/lib/melon/passes/method_collector.rb
+++ b/lib/rubyx/passes/method_collector.rb
@@ -1,4 +1,4 @@
-module Melon
+module Rubyx
   module Passes
 
     class MethodCollector < TotalProcessor
diff --git a/lib/melon/passes/method_compiler.rb b/lib/rubyx/passes/method_compiler.rb
similarity index 99%
rename from lib/melon/passes/method_compiler.rb
rename to lib/rubyx/passes/method_compiler.rb
index 2faf51ce..750ed1bb 100644
--- a/lib/melon/passes/method_compiler.rb
+++ b/lib/rubyx/passes/method_compiler.rb
@@ -1,4 +1,4 @@
-module Melon
+module Rubyx
   module Passes
 
     class MethodCompiler < AST::Processor
diff --git a/lib/melon/passes/normalizer.rb b/lib/rubyx/passes/normalizer.rb
similarity index 91%
rename from lib/melon/passes/normalizer.rb
rename to lib/rubyx/passes/normalizer.rb
index 0b45d42c..543c59c2 100644
--- a/lib/melon/passes/normalizer.rb
+++ b/lib/rubyx/passes/normalizer.rb
@@ -1,4 +1,4 @@
-module Melon
+module Rubyx
   module Passes
 
     class Normalizer < AST::Processor
diff --git a/lib/melon/passes/total_processor.rb b/lib/rubyx/passes/total_processor.rb
similarity index 94%
rename from lib/melon/passes/total_processor.rb
rename to lib/rubyx/passes/total_processor.rb
index ff5a0f40..73cf4418 100644
--- a/lib/melon/passes/total_processor.rb
+++ b/lib/rubyx/passes/total_processor.rb
@@ -1,4 +1,4 @@
-module Melon
+module Rubyx
 
   module Passes
     class TotalProcessor < AST::Processor
diff --git a/lib/melon/passes/type_collector.rb b/lib/rubyx/passes/type_collector.rb
similarity index 97%
rename from lib/melon/passes/type_collector.rb
rename to lib/rubyx/passes/type_collector.rb
index 670aa7d5..ba80c164 100644
--- a/lib/melon/passes/type_collector.rb
+++ b/lib/rubyx/passes/type_collector.rb
@@ -1,4 +1,4 @@
-module Melon
+module Rubyx
   module Passes
     class TypeCollector < TotalProcessor
 
diff --git a/lib/melon/ruby_compiler.rb b/lib/rubyx/ruby_compiler.rb
similarity index 99%
rename from lib/melon/ruby_compiler.rb
rename to lib/rubyx/ruby_compiler.rb
index 09f974a2..9354eb62 100644
--- a/lib/melon/ruby_compiler.rb
+++ b/lib/rubyx/ruby_compiler.rb
@@ -9,7 +9,7 @@ require_relative "passes/normalizer"
 require_relative "ruby_method"
 
 
-module Melon
+module Rubyx
   class RubyCompiler < Passes::TotalProcessor
 
     def self.compile( input )
diff --git a/lib/melon/ruby_method.rb b/lib/rubyx/ruby_method.rb
similarity index 98%
rename from lib/melon/ruby_method.rb
rename to lib/rubyx/ruby_method.rb
index 067f990f..8557fdc3 100644
--- a/lib/melon/ruby_method.rb
+++ b/lib/rubyx/ruby_method.rb
@@ -1,4 +1,4 @@
-module Melon
+module Rubyx
 
   class RubyMethod
 
diff --git a/test/melon/fragments/collector.rb b/test/rubyx/fragments/collector.rb
similarity index 100%
rename from test/melon/fragments/collector.rb
rename to test/rubyx/fragments/collector.rb
diff --git a/test/melon/fragments/helper.rb b/test/rubyx/fragments/helper.rb
similarity index 92%
rename from test/melon/fragments/helper.rb
rename to test/rubyx/fragments/helper.rb
index cd33632c..5ea6001c 100644
--- a/test/melon/fragments/helper.rb
+++ b/test/rubyx/fragments/helper.rb
@@ -2,8 +2,8 @@ require_relative '../helper'
 require "register/interpreter"
 require "parser/ruby22"
 
-module Melon
-  module MelonTests
+module Rubyx
+  module RubyxTests
     include CompilerHelper
     include Register::InterpreterHelpers
     subs = ObjectSpace.each_object(Class).select { |klass| klass < Register::Instruction }
diff --git a/test/melon/fragments/test_adds.rb b/test/rubyx/fragments/test_adds.rb
similarity index 91%
rename from test/melon/fragments/test_adds.rb
rename to test/rubyx/fragments/test_adds.rb
index 9c8ab13e..5a4192b5 100644
--- a/test/melon/fragments/test_adds.rb
+++ b/test/rubyx/fragments/test_adds.rb
@@ -1,8 +1,8 @@
 require_relative 'helper'
 
-module Melon
+module Rubyx
   class TestRubyAdds < MiniTest::Test
-    include MelonTests
+    include RubyxTests
 
     def pest_ruby_adds
       @string_input = <<HERE
diff --git a/test/melon/fragments/test_all.rb b/test/rubyx/fragments/test_all.rb
similarity index 100%
rename from test/melon/fragments/test_all.rb
rename to test/rubyx/fragments/test_all.rb
diff --git a/test/melon/fragments/test_calls.rb b/test/rubyx/fragments/test_calls.rb
similarity index 90%
rename from test/melon/fragments/test_calls.rb
rename to test/rubyx/fragments/test_calls.rb
index 7fde7d46..ba8d252c 100644
--- a/test/melon/fragments/test_calls.rb
+++ b/test/rubyx/fragments/test_calls.rb
@@ -1,8 +1,8 @@
 require_relative 'helper'
 
-module Melon
+module Rubyx
   class TestRubyCalls < MiniTest::Test
-    include MelonTests
+    include RubyxTests
 
     def pest_ruby_calls
       @string_input = <<HERE
diff --git a/test/melon/fragments/test_hello.rb b/test/rubyx/fragments/test_hello.rb
similarity index 97%
rename from test/melon/fragments/test_hello.rb
rename to test/rubyx/fragments/test_hello.rb
index 2908df6a..f903d874 100644
--- a/test/melon/fragments/test_hello.rb
+++ b/test/rubyx/fragments/test_hello.rb
@@ -1,8 +1,8 @@
 require_relative 'helper'
 
-module Melon
+module Rubyx
   class TestRubyHello < MiniTest::Test
-    include MelonTests
+    include RubyxTests
     Branch = Register::Branch
     Label = Register::Label
 
diff --git a/test/melon/fragments/test_itos.rb b/test/rubyx/fragments/test_itos.rb
similarity index 84%
rename from test/melon/fragments/test_itos.rb
rename to test/rubyx/fragments/test_itos.rb
index 21d8cade..39301b5c 100644
--- a/test/melon/fragments/test_itos.rb
+++ b/test/rubyx/fragments/test_itos.rb
@@ -1,8 +1,8 @@
 require_relative 'helper'
 
-module Melon
+module Rubyx
   class TestRubyItos < MiniTest::Test
-    include MelonTests
+    include RubyxTests
 
     def pest_ruby_itos
       @string_input = <<HERE
diff --git a/test/melon/fragments/test_loop.rb b/test/rubyx/fragments/test_loop.rb
similarity index 87%
rename from test/melon/fragments/test_loop.rb
rename to test/rubyx/fragments/test_loop.rb
index aeaaf228..094a1247 100644
--- a/test/melon/fragments/test_loop.rb
+++ b/test/rubyx/fragments/test_loop.rb
@@ -1,8 +1,8 @@
 require_relative 'helper'
 
-module Melon
+module Rubyx
   class TestRubyLoop < MiniTest::Test
-    include MelonTests
+    include RubyxTests
 
     def pest_ruby_loop
       @string_input = <<HERE
diff --git a/test/melon/fragments/test_many_adds.rb b/test/rubyx/fragments/test_many_adds.rb
similarity index 93%
rename from test/melon/fragments/test_many_adds.rb
rename to test/rubyx/fragments/test_many_adds.rb
index 48809438..6ada305a 100644
--- a/test/melon/fragments/test_many_adds.rb
+++ b/test/rubyx/fragments/test_many_adds.rb
@@ -1,8 +1,8 @@
 require_relative 'helper'
 
-module Melon
+module Rubyx
   class TestManyAdds < MiniTest::Test
-    include MelonTests
+    include RubyxTests
 
     def pest_ruby_adds_looping
       @string_input = <<HERE
diff --git a/test/melon/fragments/test_many_calls.rb b/test/rubyx/fragments/test_many_calls.rb
similarity index 92%
rename from test/melon/fragments/test_many_calls.rb
rename to test/rubyx/fragments/test_many_calls.rb
index b249bd0f..bdb07281 100644
--- a/test/melon/fragments/test_many_calls.rb
+++ b/test/rubyx/fragments/test_many_calls.rb
@@ -1,8 +1,8 @@
 require_relative 'helper'
 
-module Melon
+module Rubyx
   class TestManyCalls < MiniTest::Test
-    include MelonTests
+    include RubyxTests
 
     def pest_ruby_calls_looping
       @string_input = <<HERE
diff --git a/test/melon/fragments/test_many_hello.rb b/test/rubyx/fragments/test_many_hello.rb
similarity index 90%
rename from test/melon/fragments/test_many_hello.rb
rename to test/rubyx/fragments/test_many_hello.rb
index 2575c16b..d40df56c 100644
--- a/test/melon/fragments/test_many_hello.rb
+++ b/test/rubyx/fragments/test_many_hello.rb
@@ -1,8 +1,8 @@
 require_relative 'helper'
 
-module Melon
+module Rubyx
   class TestManyHello < MiniTest::Test
-    include MelonTests
+    include RubyxTests
 
     def pest_ruby_hello_looping
       @string_input = <<HERE
diff --git a/test/melon/fragments/test_many_itos.rb b/test/rubyx/fragments/test_many_itos.rb
similarity index 90%
rename from test/melon/fragments/test_many_itos.rb
rename to test/rubyx/fragments/test_many_itos.rb
index 71d609a4..e3adfb41 100644
--- a/test/melon/fragments/test_many_itos.rb
+++ b/test/rubyx/fragments/test_many_itos.rb
@@ -1,8 +1,8 @@
 require_relative 'helper'
 
-module Melon
+module Rubyx
   class TestManyItos < MiniTest::Test
-    include MelonTests
+    include RubyxTests
 
     def pest_ruby_itos_looping
       @string_input = <<HERE
diff --git a/test/melon/helper.rb b/test/rubyx/helper.rb
similarity index 95%
rename from test/melon/helper.rb
rename to test/rubyx/helper.rb
index 0858dcac..78b384c6 100644
--- a/test/melon/helper.rb
+++ b/test/rubyx/helper.rb
@@ -1,6 +1,6 @@
 require_relative '../helper'
 
-module Melon
+module Rubyx
   module CompilerHelper
 
     def in_Test(statements)
diff --git a/test/melon/passes/helper.rb b/test/rubyx/passes/helper.rb
similarity index 100%
rename from test/melon/passes/helper.rb
rename to test/rubyx/passes/helper.rb
diff --git a/test/melon/passes/test_all.rb b/test/rubyx/passes/test_all.rb
similarity index 100%
rename from test/melon/passes/test_all.rb
rename to test/rubyx/passes/test_all.rb
diff --git a/test/melon/passes/test_locals_collector.rb b/test/rubyx/passes/test_locals_collector.rb
similarity index 98%
rename from test/melon/passes/test_locals_collector.rb
rename to test/rubyx/passes/test_locals_collector.rb
index 8efbc1d3..f0fe0595 100644
--- a/test/melon/passes/test_locals_collector.rb
+++ b/test/rubyx/passes/test_locals_collector.rb
@@ -1,6 +1,6 @@
 require_relative "helper"
 
-module Melon
+module Rubyx
   module Passes
     class TestLocalsCollector < MiniTest::Test
 
diff --git a/test/melon/passes/test_method_collector.rb b/test/rubyx/passes/test_method_collector.rb
similarity index 98%
rename from test/melon/passes/test_method_collector.rb
rename to test/rubyx/passes/test_method_collector.rb
index 7a68204e..0d2983f2 100644
--- a/test/melon/passes/test_method_collector.rb
+++ b/test/rubyx/passes/test_method_collector.rb
@@ -1,6 +1,6 @@
 require_relative "helper"
 
-module Melon
+module Rubyx
   module Passes
     class TestMethodCollector < MiniTest::Test
 
diff --git a/test/melon/passes/test_normalizer.rb b/test/rubyx/passes/test_normalizer.rb
similarity index 94%
rename from test/melon/passes/test_normalizer.rb
rename to test/rubyx/passes/test_normalizer.rb
index 246ee463..50ce13e8 100644
--- a/test/melon/passes/test_normalizer.rb
+++ b/test/rubyx/passes/test_normalizer.rb
@@ -1,6 +1,6 @@
 require_relative "helper"
 
-module Melon
+module Rubyx
   module Passes
     class TestNormalizer < MiniTest::Test
 
diff --git a/test/melon/passes/test_type_collector.rb b/test/rubyx/passes/test_type_collector.rb
similarity index 98%
rename from test/melon/passes/test_type_collector.rb
rename to test/rubyx/passes/test_type_collector.rb
index 57656b15..a9d2a905 100644
--- a/test/melon/passes/test_type_collector.rb
+++ b/test/rubyx/passes/test_type_collector.rb
@@ -1,6 +1,6 @@
 require_relative "helper"
 
-module Melon
+module Rubyx
   module Passes
     class TestTypeCollector < MiniTest::Test
 
diff --git a/test/melon/test_all.rb b/test/rubyx/test_all.rb
similarity index 100%
rename from test/melon/test_all.rb
rename to test/rubyx/test_all.rb
diff --git a/test/melon/test_ruby_compiler.rb b/test/rubyx/test_ruby_compiler.rb
similarity index 99%
rename from test/melon/test_ruby_compiler.rb
rename to test/rubyx/test_ruby_compiler.rb
index 0e621321..5223bfa3 100644
--- a/test/melon/test_ruby_compiler.rb
+++ b/test/rubyx/test_ruby_compiler.rb
@@ -1,6 +1,6 @@
 require_relative "helper"
 
-module Melon
+module Rubyx
   class TestCompiler < MiniTest::Test
 
     def setup
diff --git a/test/melon/test_ruby_method.rb b/test/rubyx/test_ruby_method.rb
similarity index 98%
rename from test/melon/test_ruby_method.rb
rename to test/rubyx/test_ruby_method.rb
index d71b56b2..57cece87 100644
--- a/test/melon/test_ruby_method.rb
+++ b/test/rubyx/test_ruby_method.rb
@@ -1,6 +1,6 @@
 require_relative "helper"
 
-module Melon
+module Rubyx
   class TestRubyMethod < MiniTest::Test
     include CompilerHelper
 
diff --git a/test/test_all.rb b/test/test_all.rb
index b7c1b4de..227f3e92 100644
--- a/test/test_all.rb
+++ b/test/test_all.rb
@@ -4,7 +4,7 @@ require_relative "elf/test_all"
 
 require_relative "lib/test_all"
 
-require_relative "melon/test_all"
+require_relative "rubyx/test_all"
 
 require_relative "register/test_all"