diff --git a/app/controllers/graph_controller.rb b/app/controllers/graph_controller.rb
index d27fd0394780de36746041fd651051586f1123ae..b4bf956511295a2bccd8460fc746d8711690da29 100644
--- a/app/controllers/graph_controller.rb
+++ b/app/controllers/graph_controller.rb
@@ -22,7 +22,7 @@ def show
       format.html
 
       format.json do
-        @graph = Graph::JsonBuilder.new(project, @ref, @commit)
+        @graph = Network::Graph.new(project, @ref, @commit)
       end
     end
   end
diff --git a/app/models/graph/commit.rb b/app/models/network/commit.rb
similarity index 98%
rename from app/models/graph/commit.rb
rename to app/models/network/commit.rb
index e47a543daa9fb18dcdabb4b0ddefdf6c836e3abf..9c0a99ccd414b6ec8279e24d128b1092b14f0b1a 100644
--- a/app/models/graph/commit.rb
+++ b/app/models/network/commit.rb
@@ -1,6 +1,6 @@
 require "grit"
 
-module Graph
+module Network
   class Commit
     include ActionView::Helpers::TagHelper
 
diff --git a/app/models/graph/json_builder.rb b/app/models/network/graph.rb
similarity index 97%
rename from app/models/graph/json_builder.rb
rename to app/models/network/graph.rb
index 2e0edb8a9ca92f433c99dd8ca0ca2b2428f0ddbb..c9ecbc910e8a8e8a55244944358afcc8fb2dda37 100644
--- a/app/models/graph/json_builder.rb
+++ b/app/models/network/graph.rb
@@ -1,7 +1,7 @@
 require "grit"
 
-module Graph
-  class JsonBuilder
+module Network
+  class Graph
     attr_accessor :days, :commits, :ref_cache, :repo
 
     def self.max_count
@@ -19,7 +19,7 @@ def initialize project, ref, commit
       @days = index_commits
     end
 
-  protected
+    protected
 
     # Get commits from repository
     #
@@ -30,8 +30,8 @@ def collect_commits
       # Decorate with app/models/commit.rb
       @commits.map! { |commit| Commit.new(commit) }
 
-      # Decorate with lib/gitlab/graph/commit.rb
-      @commits.map! { |commit| Graph::Commit.new(commit) }
+      # Decorate with app/model/network/commit.rb
+      @commits.map! { |commit| Network::Commit.new(commit) }
 
       # add refs to each commit
       @commits.each { |commit| commit.add_refs(ref_cache, repo) }
diff --git a/features/steps/project/project_network_graph.rb b/features/steps/project/project_network_graph.rb
index 7e9a7c295d0dfcd52b8924c61cf48ce62f15e2e4..cf5fa751ccf612cf78e500df3ea4797481faa491 100644
--- a/features/steps/project/project_network_graph.rb
+++ b/features/steps/project/project_network_graph.rb
@@ -8,8 +8,8 @@ class ProjectNetworkGraph < Spinach::FeatureSteps
   end
 
   When 'I visit project "Shop" network page' do
-    # Stub Graph::JsonBuilder max_size to speed up test (10 commits vs. 650)
-    Graph::JsonBuilder.stub(max_count: 10)
+    # Stub Graph max_size to speed up test (10 commits vs. 650)
+    Network::Graph.stub(max_count: 10)
 
     project = Project.find_by_name("Shop")
     visit project_graph_path(project, "master")
@@ -25,7 +25,7 @@ class ProjectNetworkGraph < Spinach::FeatureSteps
     end
   end
 
-  And 'I switch ref to "stable"' do
+  When 'I switch ref to "stable"' do
     page.select 'stable', :from => 'ref'
     sleep 2
   end
@@ -40,7 +40,7 @@ class ProjectNetworkGraph < Spinach::FeatureSteps
     end
   end
 
-  And 'I looking for a commit by SHA of "v2.1.0"' do
+  When 'I looking for a commit by SHA of "v2.1.0"' do
     within ".content .search" do
       fill_in 'q', :with => '98d6492'
       find('button').click
diff --git a/features/steps/shared/paths.rb b/features/steps/shared/paths.rb
index 431d5299d8fde3a6973eba23250336e8f3bd2c1d..54cdbd4ba2f2275e21d7dc0900fd791564a423a1 100644
--- a/features/steps/shared/paths.rb
+++ b/features/steps/shared/paths.rb
@@ -142,8 +142,8 @@ module SharedPaths
   end
 
   Given "I visit my project's network page" do
-    # Stub Graph::JsonBuilder max_size to speed up test (10 commits vs. 650)
-    Graph::JsonBuilder.stub(max_count: 10)
+    # Stub Graph max_size to speed up test (10 commits vs. 650)
+    Network::Graph.stub(max_count: 10)
 
     visit project_graph_path(@project, root_ref)
   end