diff --git a/app/controllers/public/content_viewer_controller.rb b/app/controllers/public/content_viewer_controller.rb
index b77a891..047ce38 100644
--- a/app/controllers/public/content_viewer_controller.rb
+++ b/app/controllers/public/content_viewer_controller.rb
@@ -7,7 +7,7 @@ class ContentViewerController < ApplicationController
 
   def view_page
     path = params[:page].join('/')
-    @version = params[:rev]
+    @version = params[:version]
 
     if path.blank?
       @page = profile.home_page
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 0608091..27e3a70 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1403,7 +1403,7 @@ module ApplicationHelper
   end
 
   def display_article_versions(article, version = nil)
-    content_tag('ul', article.versions.map {|v| link_to("r#{v.version}", @page.url.merge(:rev => v.version))})
+    content_tag('ul', article.versions.map {|v| link_to("r#{v.version}", @page.url.merge(:version => v.version))})
   end
 
 end
diff --git a/app/models/article.rb b/app/models/article.rb
index ba71540..2a36a3f 100644
--- a/app/models/article.rb
+++ b/app/models/article.rb
@@ -655,7 +655,7 @@ class Article < ActiveRecord::Base
       (params[:npage] ? "-npage-#{params[:npage]}" : '') +
       (params[:year] ? "-year-#{params[:year]}" : '') +
       (params[:month] ? "-month-#{params[:month]}" : '') +
-      (params[:rev] ? "-rev-#{params[:rev]}" : '')
+      (params[:version] ? "-version-#{params[:version]}" : '')
 
   end
 
diff --git a/app/views/content_viewer/_article_versions.rhtml b/app/views/content_viewer/_article_versions.rhtml
index 764aafc..5e7165a 100644
--- a/app/views/content_viewer/_article_versions.rhtml
+++ b/app/views/content_viewer/_article_versions.rhtml
@@ -1,6 +1,6 @@
 <h3><%= _('Versions') %></h3>
 <ul class='article-versions'>
   <% @page.versions.each do |v| %>
-    <li><%= link_to("#{v.version}", @page.url.merge(:rev => v.version)) %></li>
+    <li><%= link_to("#{v.version}", @page.url.merge(:version => v.version)) %></li>
   <% end %>
 <ul>
diff --git a/test/functional/cms_controller_test.rb b/test/functional/cms_controller_test.rb
index fc73afe..db406ef 100644
--- a/test/functional/cms_controller_test.rb
+++ b/test/functional/cms_controller_test.rb
@@ -1719,6 +1719,23 @@ class CmsControllerTest < ActionController::TestCase
     assert_redirected_to '/'
   end
 
+  should 'edit article with content from older version' do
+    article = profile.articles.create(:name => 'first version')
+    article.name = 'second version'; article.save
+
+    get :edit, :profile => profile.identifier, :id => article.id, :version => 1
+    assert_equal 'second version', Article.find(article.id).name
+    assert_equal 'first version', assigns(:article).name
+  end
+
+  should 'save article with content from older version' do
+    article = profile.articles.create(:name => 'first version')
+    article.name = 'second version'; article.save
+
+    post :edit, :profile => profile.identifier, :id => article.id, :version => 1
+    assert_equal 'first version', Article.find(article.id).name
+  end
+
   protected
 
   # FIXME this is to avoid adding an extra dependency for a proper JSON parser.
diff --git a/test/functional/content_viewer_controller_test.rb b/test/functional/content_viewer_controller_test.rb
index fc1dde2..6ba6058 100644
--- a/test/functional/content_viewer_controller_test.rb
+++ b/test/functional/content_viewer_controller_test.rb
@@ -384,7 +384,7 @@ class ContentViewerControllerTest < ActionController::TestCase
     page = profile.articles.create!(:name => 'myarticle', :body => 'test article')
     page.body = 'test article edited'; page.save
 
-    get :view_page, :profile => profile.identifier, :page => [ 'myarticle' ], :rev => 1
+    get :view_page, :profile => profile.identifier, :page => [ 'myarticle' ], :version => 1
 
     assert_equal 1, assigns(:page).version
   end
diff --git a/test/unit/article_test.rb b/test/unit/article_test.rb
index 5a2261f..1ea2c11 100644
--- a/test/unit/article_test.rb
+++ b/test/unit/article_test.rb
@@ -742,7 +742,7 @@ class ArticleTest < ActiveSupport::TestCase
 
  should 'use revision number to compose cache key' do
     a = fast_create(Article, :name => 'Versioned article', :profile_id => profile.id)
-    assert_match(/-rev-2/,a.cache_key(:rev => 2))
+    assert_match(/-rev-2/,a.cache_key(:version => 2))
   end
 
   should 'not be highlighted by default' do
--
libgit2 0.21.2