diff --git a/ruby/manifests/init.pp b/ruby/manifests/init.pp
index a3ebb31..e767508 100644
--- a/ruby/manifests/init.pp
+++ b/ruby/manifests/init.pp
@@ -9,8 +9,8 @@ class ruby::rubygems {
 
     package { "ruby-devel":
         ensure => installed,
-        name   => $operatingsystem ? {
-            "ubuntu" => regsubst($rubyversion, '^([0-9]+\.[0-9]+)\..*', 'ruby\1-dev'),
+        name   => $::operatingsystem ? {
+            "ubuntu" => regsubst($::rubyversion, '^([0-9]+\.[0-9]+)\..*', 'ruby\1-dev'),
             default  => "ruby-devel",
         },
     }
@@ -29,9 +29,9 @@ class ruby::mysql {
 
     package { "ruby-mysql":
         ensure => installed,
-        name   => $operatingsystem ? {
-            "debian" => regsubst($rubyversion, '^([0-9]+\.[0-9]+)\..*', 'libmysql-ruby\1'),
-            "ubuntu" => regsubst($rubyversion, '^([0-9]+\.[0-9]+)\..*', 'libmysql-ruby\1'),
+        name   => $::operatingsystem ? {
+            "debian" => regsubst($::rubyversion, '^([0-9]+\.[0-9]+)\..*', 'libmysql-ruby\1'),
+            "ubuntu" => regsubst($::rubyversion, '^([0-9]+\.[0-9]+)\..*', 'libmysql-ruby\1'),
             default  => "ruby-mysql",
         },
     }
@@ -43,17 +43,17 @@ class ruby::mysql {
 #
 class ruby::rails {
 
-    case $operatingsystem {
+    case $::operatingsystem {
         "centos": {
-            if $operatingsystemrelease =~ /^[1-5]/ {
+            if $::operatingsystemrelease =~ /^[1-5]/ {
                 package { "rubygem-rails":
                     ensure => installed,
                 }
             } else {
                 require ruby::rubygems
                 package { "rubygem-rails":
-                    name     => "rails",
                     ensure   => "2.3.14",
+                    name     => "rails",
                     provider => "gem",
                 }
             }
@@ -61,7 +61,7 @@ class ruby::rails {
         default: {
             package { "rubygem-rails":
                 ensure => installed,
-                name   => $operatingsystem ? {
+                name   => $::operatingsystem ? {
                     "debian"  => "rails",
                     "ubuntu"  => "rails",
                     "openbsd" => "ruby-rails",
@@ -80,13 +80,13 @@ class ruby::rrd {
 
     package { "ruby-rrd":
         ensure => installed,
-        name   => $operatingsystem ? {
-            centos  => $operatingsystemrelease ? {
+        name   => $::operatingsystem ? {
+            centos  => $::operatingsystemrelease ? {
                 /^[1-5]/ => "ruby-RRDtool",
                 default  => "rrdtool-ruby",
             },
-            debian  => regsubst($rubyversion, '^([0-9]+\.[0-9]+)\..*', 'librrd-ruby\1'),
-            ubuntu  => regsubst($rubyversion, '^([0-9]+\.[0-9]+)\..*', 'librrd-ruby\1'),
+            debian  => regsubst($::rubyversion, '^([0-9]+\.[0-9]+)\..*', 'librrd-ruby\1'),
+            ubuntu  => regsubst($::rubyversion, '^([0-9]+\.[0-9]+)\..*', 'librrd-ruby\1'),
             openbsd => "ruby-rrd",
             default => "ruby-RRDtool",
         },
@@ -99,9 +99,9 @@ class ruby::rrd {
 #
 class ruby::sqlite3 {
 
-    case $operatingsystem {
+    case $::operatingsystem {
         "centos": {
-            if $operatingsystemrelease =~ /^[1-5]/ {
+            if $::operatingsystemrelease =~ /^[1-5]/ {
                 package { "rubygem-sqlite3-ruby":
                     ensure => installed,
                 }
@@ -112,8 +112,8 @@ class ruby::sqlite3 {
                     before => Package["rubygem-sqlite3"],
                 }
                 package { "rubygem-sqlite3":
-                    name     => "sqlite3",
                     ensure   => installed,
+                    name     => "sqlite3",
                     provider => "gem",
                 }
             }
@@ -121,9 +121,9 @@ class ruby::sqlite3 {
         default: {
             package { "rubygem-sqlite3-ruby":
                 ensure => installed,
-                name   => $operatingsystem ? {
-                    "debian"  => regsubst($rubyversion, '^([0-9]+\.[0-9]+)\..*', 'libsqlite3-ruby\1'),
-                    "ubuntu"  => regsubst($rubyversion, '^([0-9]+\.[0-9]+)\..*', 'libsqlite3-ruby\1'),
+                name   => $::operatingsystem ? {
+                    "debian"  => regsubst($::rubyversion, '^([0-9]+\.[0-9]+)\..*', 'libsqlite3-ruby\1'),
+                    "ubuntu"  => regsubst($::rubyversion, '^([0-9]+\.[0-9]+)\..*', 'libsqlite3-ruby\1'),
                     "openbsd" => "ruby-sqlite3",
                     default   => "rubygem-sqlite3-ruby",
                 },