diff --git a/lib/puppet/parser/functions/debian_nextcodename.rb b/lib/puppet/parser/functions/debian_nextcodename.rb
new file mode 100644
index 0000000..37322a2
--- /dev/null
+++ b/lib/puppet/parser/functions/debian_nextcodename.rb
@@ -0,0 +1,11 @@
+module Puppet::Parser::Functions
+  newfunction(:debian_nextcodename, :type => :rvalue) do |args|
+    result = case #{args[0]}
+      when 'etch'    then 'lenny'
+      when 'lenny'   then 'squeeze'
+      when 'squeeze' then 'sid'
+      when 'sid'     then 'experimental'
+    end
+    return result
+  end
+end
diff --git a/lib/puppet/parser/functions/debian_nextrelease.rb b/lib/puppet/parser/functions/debian_nextrelease.rb
new file mode 100644
index 0000000..62e3234
--- /dev/null
+++ b/lib/puppet/parser/functions/debian_nextrelease.rb
@@ -0,0 +1,11 @@
+module Puppet::Parser::Functions
+  newfunction(:debian_nextrelease, :type => :rvalue) do |args|
+    result = case #{args[0]}
+      when 'oldstable' then 'stable'
+      when 'stable'    then 'testing'
+      when 'testing'   then 'unstable'
+      when 'unstable'  then 'experimental'
+    end
+    return result
+  end
+end
diff --git a/lib/puppet/parser/functions/debian_release.rb b/lib/puppet/parser/functions/debian_release.rb
index ef30484..ec46601 100644
--- a/lib/puppet/parser/functions/debian_release.rb
+++ b/lib/puppet/parser/functions/debian_release.rb
@@ -1,11 +1,12 @@
 module Puppet::Parser::Functions
   newfunction(:debian_release, :type => :rvalue) do |args|
-    case #{args[0]} {
-      etch:         { 'oldstable' }
-      lenny:        { 'stable' }
-      squeeze:      { 'testing' }
-      sid:          { 'unstable' }
-      experimental: { 'experimental' }
-    }
+    result = case #{args[0]}
+      when 'etch'         then 'oldstable'
+      when 'lenny'        then 'stable'
+      when 'squeeze'      then 'testing'
+      when 'sid'          then 'unstable'
+      when 'experimental' then 'experimental'
+    end
+    return result
   end
 end
diff --git a/lib/puppet/parser/functions/nextcodename.rb b/lib/puppet/parser/functions/nextcodename.rb
deleted file mode 100644
index 3dd592b..0000000
--- a/lib/puppet/parser/functions/nextcodename.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:debian_nextcodename, :type => :rvalue) do |args|
-    case #{args[0]} {
-      etch:    { 'lenny' }
-      lenny:   { 'squeeze' }
-      squeeze: { 'sid' }
-      sid:     { 'experimental' }
-    }
-  end
-end
diff --git a/lib/puppet/parser/functions/nextrelease.rb b/lib/puppet/parser/functions/nextrelease.rb
deleted file mode 100644
index 4449121..0000000
--- a/lib/puppet/parser/functions/nextrelease.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:debian_nextrelease, :type => :rvalue) do |args|
-    case #{args[0]} {
-      oldstable: { 'stable' }
-      stable:    { 'testing' }
-      testing:   { 'unstable' }
-      unstable:  { 'experimental' }
-    }
-  end
-end