diff --git a/app/models/issue.rb b/app/models/issue.rb
index 6409eeb..96a5490 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -1,6 +1,6 @@
 class Issue < ActiveRecord::Base
   include IssueCommonality
-  include Upvote
+  include Votes
 
   acts_as_taggable_on :labels
 
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 542817b..3376e31 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -2,7 +2,7 @@ require File.join(Rails.root, "app/models/commit")
 
 class MergeRequest < ActiveRecord::Base
   include IssueCommonality
-  include Upvote
+  include Votes
 
   BROKEN_DIFF = "--broken-diff"
 
diff --git a/app/roles/upvote.rb b/app/roles/upvote.rb
deleted file mode 100644
index 7efa6f2..0000000
--- a/app/roles/upvote.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-module Upvote
-  # Return the number of +1 comments (upvotes)
-  def upvotes
-    notes.select(&:upvote?).size
-  end
-end
diff --git a/app/roles/votes.rb b/app/roles/votes.rb
new file mode 100644
index 0000000..2940929
--- /dev/null
+++ b/app/roles/votes.rb
@@ -0,0 +1,6 @@
+module Votes
+  # Return the number of +1 comments (upvotes)
+  def upvotes
+    notes.select(&:upvote?).size
+  end
+end
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index ca6307e..34192da 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -12,7 +12,7 @@ describe Issue do
 
   describe 'modules' do
     it { should include_module(IssueCommonality) }
-    it { should include_module(Upvote) }
+    it { should include_module(Votes) }
   end
 
   subject { Factory.create(:issue) }
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index d1253b3..523e823 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -8,6 +8,6 @@ describe MergeRequest do
 
   describe 'modules' do
     it { should include_module(IssueCommonality) }
-    it { should include_module(Upvote) }
+    it { should include_module(Votes) }
   end
 end
diff --git a/spec/roles/upvote_spec.rb b/spec/roles/upvote_spec.rb
deleted file mode 100644
index 24288ad..0000000
--- a/spec/roles/upvote_spec.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-require 'spec_helper'
-
-describe Issue, "Upvote" do
-  let(:issue) { create(:issue) }
-
-  it "with no notes has a 0/0 score" do
-    issue.upvotes.should == 0
-  end
-
-  it "should recognize non-+1 notes" do
-    issue.notes << create(:note, note: "No +1 here")
-    issue.should have(1).note
-    issue.notes.first.upvote?.should be_false
-    issue.upvotes.should == 0
-  end
-
-  it "should recognize a single +1 note" do
-    issue.notes << create(:note, note: "+1 This is awesome")
-    issue.upvotes.should == 1
-  end
-
-  it "should recognize multiple +1 notes" do
-    issue.notes << create(:note, note: "+1 This is awesome")
-    issue.notes << create(:note, note: "+1 I want this")
-    issue.upvotes.should == 2
-  end
-end
diff --git a/spec/roles/votes_spec.rb b/spec/roles/votes_spec.rb
new file mode 100644
index 0000000..24288ad
--- /dev/null
+++ b/spec/roles/votes_spec.rb
@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe Issue, "Upvote" do
+  let(:issue) { create(:issue) }
+
+  it "with no notes has a 0/0 score" do
+    issue.upvotes.should == 0
+  end
+
+  it "should recognize non-+1 notes" do
+    issue.notes << create(:note, note: "No +1 here")
+    issue.should have(1).note
+    issue.notes.first.upvote?.should be_false
+    issue.upvotes.should == 0
+  end
+
+  it "should recognize a single +1 note" do
+    issue.notes << create(:note, note: "+1 This is awesome")
+    issue.upvotes.should == 1
+  end
+
+  it "should recognize multiple +1 notes" do
+    issue.notes << create(:note, note: "+1 This is awesome")
+    issue.notes << create(:note, note: "+1 I want this")
+    issue.upvotes.should == 2
+  end
+end
--
libgit2 0.21.2