diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml
index fe66f89..8aefdf7 100644
--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
@@ -59,7 +59,7 @@
                   = private_icon
                 = link_to project.name_with_namespace, project
                 .pull-right
-                  = link_to 'Team', project_team_index_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"
+                  = link_to 'Members', project_team_index_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"
                   = link_to 'Edit', edit_project_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"
                   = link_to 'Remove', project, confirm: remove_project_message(project), method: :delete, class: "btn btn-small btn-remove"
             - if @group.projects.blank?
diff --git a/app/views/projects/_clone_panel.html.haml b/app/views/projects/_clone_panel.html.haml
index 4aee2b1..f7889b8 100644
--- a/app/views/projects/_clone_panel.html.haml
+++ b/app/views/projects/_clone_panel.html.haml
@@ -40,5 +40,5 @@
             - if can?(current_user, :admin_team_member, @project)
               %li.divider
               %li
-                = link_to new_project_team_member_path(@project), title: "New Team member" do
-                  Team member
+                = link_to new_project_team_member_path(@project), title: "New project member" do
+                  Project member
diff --git a/app/views/projects/team_members/_form.html.haml b/app/views/projects/team_members/_form.html.haml
index f96fa21..5214a54 100644
--- a/app/views/projects/team_members/_form.html.haml
+++ b/app/views/projects/team_members/_form.html.haml
@@ -1,5 +1,5 @@
 %h3.page-title
-  = "New Team member(s)"
+  = "New project member(s)"
 
 = form_for @user_project_relation, as: :team_member, url: project_team_members_path(@project) do |f|
   -if @user_project_relation.errors.any?
@@ -8,13 +8,13 @@
         - @user_project_relation.errors.full_messages.each do |msg|
           %li= msg
 
-  %h6 1. Choose people you want in the team
+  %p 1. Choose people you want in the project
   .control-group
     = f.label :user_ids, "People"
     .controls
       = users_select_tag(:user_ids, multiple: true)
 
-  %h6 2. Set access level for them
+  %p 2. Set access level for them
   .control-group
     = f.label :project_access, "Project Access"
     .controls= select_tag :project_access, options_for_select(Gitlab::Access.options, @user_project_relation.project_access), class: "project-access-select chosen"
diff --git a/app/views/projects/team_members/index.html.haml b/app/views/projects/team_members/index.html.haml
index 8832558..acbe829 100644
--- a/app/views/projects/team_members/index.html.haml
+++ b/app/views/projects/team_members/index.html.haml
@@ -3,9 +3,9 @@
 
   - if can? current_user, :admin_team_member, @project
     %span.pull-right
-      = link_to new_project_team_member_path(@project), class: "btn btn-new grouped", title: "New Team Member" do
-        New Team Member
-      = link_to import_project_team_members_path(@project), class: "btn grouped", title: "Import team from another project" do
+      = link_to new_project_team_member_path(@project), class: "btn btn-new grouped", title: "New project member" do
+        New project member
+      = link_to import_project_team_members_path(@project), class: "btn grouped", title: "Import members from another project" do
         Import members
 
 %p.light
--
libgit2 0.21.2