diff --git a/.travis.yml b/.travis.yml
index bdf321a..5e834b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,15 @@
 language: ruby
 
 rvm:
-  - 2.2.5
+  - 2.5.1
 
 env:
   - RAILS_VERSION=5.2.0
   - RAILS_VERSION=4.2.0
-  - RAILS_VERSION=3.2.22
 
 cache:
   directories:
-    - /home/travis/.rvm/gems/ruby-2.2.5
+    - /home/travis/.rvm/gems/ruby-2.5.1
 
 install: ./ci/build.sh
 
@@ -26,7 +25,7 @@ jobs:
     - stage: publish components
       script: 'cd rswag-api'
       deploy:
-        gemspec: rswag-api.gemspec
+        gemspec: open_api-rswag-api.gemspec
         provider: rubygems
         api_key: $RUBYGEMS_API_KEY
         on:
@@ -36,7 +35,7 @@ jobs:
     - stage: publish components
       script: 'cd rswag-specs'
       deploy:
-        gemspec: rswag-specs.gemspec
+        gemspec: open_api-rswag-specs.gemspec
         provider: rubygems
         api_key: $RUBYGEMS_API_KEY
         on:
@@ -46,7 +45,7 @@ jobs:
     - stage: publish components
       script: 'cd rswag-ui'
       deploy:
-        gemspec: rswag-ui.gemspec
+        gemspec: open_api-rswag-ui.gemspec
         provider: rubygems
         api_key: $RUBYGEMS_API_KEY
         skip_cleanup: true
@@ -57,7 +56,7 @@ jobs:
     - stage: publish rswag
       script: 'cd rswag'
       deploy:
-        gemspec: rswag.gemspec
+        gemspec: open_api-rswag.gemspec
         provider: rubygems
         api_key: $RUBYGEMS_API_KEY
         on:
diff --git a/rswag-api/open_api-rswag-api.gemspec b/rswag-api/open_api-rswag-api.gemspec
index fce54c7..621a6cd 100644
--- a/rswag-api/open_api-rswag-api.gemspec
+++ b/rswag-api/open_api-rswag-api.gemspec
@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.version     = ENV['TRAVIS_TAG'] || '0.0.0'
   s.authors     = ["Richie Morris", "Jay Danielian"]
   s.email       = ["domaindrivendev@gmail.com"]
-  s.homepage    = "https://github.com/jdanielian/rswag"
+  s.homepage    = "https://github.com/jdanielian/open-api-rswag"
   s.summary     = "A Rails Engine that exposes Swagger files as JSON endpoints"
   s.description = "Open up your API to the phenomenal Swagger ecosystem by exposing Swagger files, that describe your service, as JSON endpoints"
   s.license     = "MIT"
diff --git a/rswag-specs/open_api-rswag-specs.gemspec b/rswag-specs/open_api-rswag-specs.gemspec
index 94bc6fd..7d2b5e6 100644
--- a/rswag-specs/open_api-rswag-specs.gemspec
+++ b/rswag-specs/open_api-rswag-specs.gemspec
@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.version     = ENV['TRAVIS_TAG'] || '0.0.0'
   s.authors     = ['Richie Morris', 'Jay Danielian']
   s.email       = ['domaindrivendev@gmail.com']
-  s.homepage    = 'https://github.com/jdanielian/rswag'
+  s.homepage    = 'https://github.com/jdanielian/open-api-rswag'
   s.summary     = 'A Swagger-based DSL for rspec-rails & accompanying rake task for generating Swagger files'
   s.description = 'Simplify API integration testing with a succinct rspec DSL and generate Swagger files directly from your rspecs'
   s.license     = 'MIT'
diff --git a/rswag-ui/rswag-ui.gemspec b/rswag-ui/open_api-rswag-ui.gemspec
similarity index 92%
rename from rswag-ui/rswag-ui.gemspec
rename to rswag-ui/open_api-rswag-ui.gemspec
index e961438..61c0de5 100644
--- a/rswag-ui/rswag-ui.gemspec
+++ b/rswag-ui/open_api-rswag-ui.gemspec
@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.version     = ENV['TRAVIS_TAG'] || '0.0.0'
   s.authors     = ["Richie Morris", "Jay Danielian"]
   s.email       = ["domaindrivendev@gmail.com"]
-  s.homepage    = "https://github.com/jaydanielian/rswag"
+  s.homepage    = "https://github.com/jdanielian/open-api-rswag"
   s.summary     = "A Rails Engine that includes swagger-ui and powers it from configured Swagger endpoints"
   s.description = "Expose beautiful API documentation, that's powered by Swagger JSON endpoints, including a UI to explore and test operations"
   s.license     = "MIT"
diff --git a/rswag/lib/open_api/rswag.rb b/rswag/lib/open_api/rswag.rb
new file mode 100644
index 0000000..9c854ea
--- /dev/null
+++ b/rswag/lib/open_api/rswag.rb
@@ -0,0 +1,8 @@
+require 'open_api/rswag/specs'
+require 'open_api/rswag/api'
+require 'open_api/rswag/ui'
+
+module OpenApi
+  module Rswag
+  end
+end
diff --git a/rswag/lib/open_api/rswag/railtie.rb b/rswag/lib/open_api/rswag/railtie.rb
new file mode 100644
index 0000000..b978a6d
--- /dev/null
+++ b/rswag/lib/open_api/rswag/railtie.rb
@@ -0,0 +1,6 @@
+module OpenApi
+  module Rswag
+    class Railtie < ::Rails::Railtie
+    end
+  end
+end
diff --git a/rswag/lib/rswag.rb b/rswag/lib/rswag.rb
deleted file mode 100644
index 04b67d1..0000000
--- a/rswag/lib/rswag.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-require 'rswag/specs'
-require 'rswag/api'
-require 'rswag/ui'
-
-module Rswag
-end
diff --git a/rswag/lib/rswag/railtie.rb b/rswag/lib/rswag/railtie.rb
deleted file mode 100644
index 57d525f..0000000
--- a/rswag/lib/rswag/railtie.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-module Rswag
-  class Railtie < ::Rails::Railtie
-  end
-end
diff --git a/rswag/rswag.gemspec b/rswag/open_api-rswag.gemspec
similarity index 57%
rename from rswag/rswag.gemspec
rename to rswag/open_api-rswag.gemspec
index a2ed250..bfd3be4 100644
--- a/rswag/rswag.gemspec
+++ b/rswag/open_api-rswag.gemspec
@@ -2,18 +2,18 @@ $:.push File.expand_path("../lib", __FILE__)
 
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
-  s.name        = "rswag"
+  s.name        = "open_api-rswag"
   s.version     = ENV['TRAVIS_TAG'] || '0.0.0'
-  s.authors     = ["Richie Morris"]
+  s.authors     = ["Richie Morris", "Jay Danielian"]
   s.email       = ["domaindrivendev@gmail.com"]
-  s.homepage    = "https://github.com/domaindrivendev/rswag"
+  s.homepage    = "https://github.com/jdanielian/open-api-rswag"
   s.summary     = "Swagger tooling for Rails API's"
   s.description = "Generate beautiful API documentation, including a UI to explore and test operations, directly from your rspec integration tests"
   s.license     = "MIT"
 
   s.files = Dir["{lib}/**/*"] + [ "MIT-LICENSE" ]
 
-  s.add_dependency 'rswag-specs', ENV['TRAVIS_TAG'] || '0.0.0'
-  s.add_dependency 'rswag-api', ENV['TRAVIS_TAG'] || '0.0.0'
-  s.add_dependency 'rswag-ui', ENV['TRAVIS_TAG'] || '0.0.0'
+  s.add_dependency 'open_api-rswag-specs', ENV['TRAVIS_TAG'] || '0.0.0'
+  s.add_dependency 'open_api-rswag-api', ENV['TRAVIS_TAG'] || '0.0.0'
+  s.add_dependency 'open_api-rswag-ui', ENV['TRAVIS_TAG'] || '0.0.0'
 end