diff --git a/apex-aprs.gemspec b/apex-aprs.gemspec
index 8f9cc465bdb028280e59c08ae846e977f4b56394..8a7693ef6e8eb977af119ce5a1a4aeff760fbde5 100644
--- a/apex-aprs.gemspec
+++ b/apex-aprs.gemspec
@@ -1,7 +1,7 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'aprs/app_info'
+require 'apex/app_info'
 
 Gem::Specification.new do |spec|
     spec.name = 'apex-aprs'
diff --git a/lib/apex.rb b/lib/apex.rb
index 1f00ad11f7057f74c71e8382739bdaeff881cd5b..8a4206b4ee1e95c1863808ac46230d0c7c206fc4 100644
--- a/lib/apex.rb
+++ b/lib/apex.rb
@@ -1,4 +1 @@
-require 'aprs/aprs_kiss'
-
-module Apex
-end
+require 'apex/aprs_kiss'
\ No newline at end of file
diff --git a/lib/apex/app_info.rb b/lib/apex/app_info.rb
index f9f561fc13d53a8c855064e3169da46ef40361b4..63924c2a6f86d23e86ff6863aa62af9ffa4f877b 100644
--- a/lib/apex/app_info.rb
+++ b/lib/apex/app_info.rb
@@ -1,3 +1,3 @@
-module Aprs
+module Apex
     VERSION = "1.0.0"
 end
diff --git a/test/tc_aprs_kiss.rb b/test/tc_aprs_kiss.rb
index 929eaafcea4c27359cb0d6ea5226cf24572ca9d0..f6aa7a4874ab7bac469c71839fe0de7c543c433a 100644
--- a/test/tc_aprs_kiss.rb
+++ b/test/tc_aprs_kiss.rb
@@ -1,23 +1,23 @@
 require 'test/unit'
 require 'kiss/test/kiss_mock'
-require_relative '../lib/aprs/aprs_kiss'
+require_relative '../lib/apex/aprs_kiss'
 
-module Aprs
+module Apex
     DECODED_FRAME_KISS = {
-        'source': 'W2GMD-1',
-        'destination': 'OMG',
-        'path': ['WIDE1-1', 'WIDE2-2'],
-        'text': 'test_encode_frame'
+        :source => 'W2GMD-1',
+        :destination => 'OMG',
+        :path => ['WIDE1-1', 'WIDE2-2'],
+        :text => 'test_encode_frame'
     }
     ENCODED_FRAME_KISS = [192, 0, 158, 154, 142, 64, 64, 64, 96, 174, 100, 142, 154, 136, 64, 98, 174, 146, 136, 138, 98,
                           64, 98, 174, 146, 136, 138, 100, 64, 101, 3, 240, 116, 101, 115, 116, 95, 101, 110, 99, 111, 100,
                           101, 95, 102, 114, 97, 109, 101, 192]
 
     DECODED_FRAME_KISS_INVALID = {
-        'source': 'KG6WTF',
-        'destination': 'S7TSUV',
-        'path': ['MTOSO-2', 'WIDE2*' 'qAR', 'KF6FIR-10'],
-        'text': '`17El#X-/kg6wtf@gosselinfamily.com'
+        :source => 'KG6WTF',
+        :destination => 'S7TSUV',
+        :path => ['MTOSO-2', 'WIDE2*' 'qAR', 'KF6FIR-10'],
+        :text => '`17El#X-/kg6wtf@gosselinfamily.com'
     }
     ENCODED_FRAME_KISS_INVALID = [192, 0, 166, 110, 168, 166, 170, 172, 96, 150, 142, 108, 174, 168, 140, 96, 154, 168, 158,
                                   166, 158, 64, 100, 174, 146, 136, 138, 100, 226, 130, 164, 224, 150, 140, 108, 140, 146, 164,