diff --git a/app/templates/components/badge-gitlab.hbs b/app/templates/components/badge-git-lab.hbs
similarity index 100%
rename from app/templates/components/badge-gitlab.hbs
rename to app/templates/components/badge-git-lab.hbs
diff --git a/migrations/20170708175501_rename_badge_gitlab_to_git-lab/down.sql b/migrations/20170708175501_rename_badge_gitlab_to_git-lab/down.sql
new file mode 100644
index 00000000000..a152e283cbe
--- /dev/null
+++ b/migrations/20170708175501_rename_badge_gitlab_to_git-lab/down.sql
@@ -0,0 +1 @@
+UPDATE badges SET badge_type = replace(badge_type, 'git-lab', 'gitlab');
diff --git a/migrations/20170708175501_rename_badge_gitlab_to_git-lab/up.sql b/migrations/20170708175501_rename_badge_gitlab_to_git-lab/up.sql
new file mode 100644
index 00000000000..965a5908513
--- /dev/null
+++ b/migrations/20170708175501_rename_badge_gitlab_to_git-lab/up.sql
@@ -0,0 +1 @@
+UPDATE badges SET badge_type = replace(badge_type, 'gitlab', 'git-lab');
diff --git a/mirage/fixtures/crates.js b/mirage/fixtures/crates.js
index d188c0ada31..c699d0a530f 100644
--- a/mirage/fixtures/crates.js
+++ b/mirage/fixtures/crates.js
@@ -76,7 +76,7 @@ export default [{
                 "branch": "master",
                 "repository": "huonw/external_mixin"
             },
-            "badge_type": "gitlab"
+            "badge_type": "git-lab"
         },
         {
             "attributes": {
diff --git a/src/badge.rs b/src/badge.rs
index d4d361755d9..f38d95cd0a3 100644
--- a/src/badge.rs
+++ b/src/badge.rs
@@ -19,7 +19,6 @@ pub enum Badge {
         branch: Option<String>,
         service: Option<String>,
     },
-    #[serde(rename = "gitlab")]
     GitLab {
         repository: String,
         branch: Option<String>,
@@ -58,18 +57,6 @@ impl Badge {
         serde_json::from_value(serde_json::to_value(self).unwrap()).unwrap()
     }
 
-    pub fn badge_type(&self) -> &'static str {
-        match *self {
-            Badge::TravisCi { .. } => "travis-ci",
-            Badge::Appveyor { .. } => "appveyor",
-            Badge::GitLab { .. } => "gitlab",
-            Badge::IsItMaintainedIssueResolution { .. } => "is-it-maintained-issue-resolution",
-            Badge::IsItMaintainedOpenIssues { .. } => "is-it-maintained-open-issues",
-            Badge::Codecov { .. } => "codecov",
-            Badge::Coveralls { .. } => "coveralls",
-        }
-    }
-
     pub fn update_crate<'a>(
         conn: &PgConnection,
         krate: &Crate,
diff --git a/src/tests/badge.rs b/src/tests/badge.rs
index aa1b6f66089..2ff94fd54f2 100644
--- a/src/tests/badge.rs
+++ b/src/tests/badge.rs
@@ -158,7 +158,7 @@ fn update_add_gitlab() {
     let conn = app.diesel_database.get().unwrap();
 
     let mut badges = HashMap::new();
-    badges.insert(String::from("gitlab"), test_badges.gitlab_attributes);
+    badges.insert(String::from("git-lab"), test_badges.gitlab_attributes);
     Badge::update_crate(&conn, &krate, Some(&badges)).unwrap();
     assert_eq!(krate.badges(&conn).unwrap(), vec![test_badges.gitlab]);
 }
@@ -231,7 +231,7 @@ fn replace_badge() {
 
     // Add a badge
     let mut badges = HashMap::new();
-    badges.insert(String::from("gitlab"), test_badges.gitlab_attributes);
+    badges.insert(String::from("git-lab"), test_badges.gitlab_attributes);
     Badge::update_crate(&conn, &krate, Some(&badges)).unwrap();
     assert_eq!(krate.badges(&conn).unwrap(), vec![test_badges.gitlab]);
 
@@ -288,7 +288,7 @@ fn clear_badges() {
     // Adding 3 badges
     badges.insert(String::from("appveyor"), test_badges.appveyor_attributes);
     badges.insert(String::from("travis-ci"), test_badges.travis_ci_attributes);
-    badges.insert(String::from("gitlab"), test_badges.gitlab_attributes);
+    badges.insert(String::from("git-lab"), test_badges.gitlab_attributes);
     Badge::update_crate(&conn, &krate, Some(&badges)).unwrap();
 
     let current_badges = krate.badges(&conn).unwrap();
@@ -348,11 +348,11 @@ fn gitlab_required_keys() {
 
     // Repository is a required key
     test_badges.gitlab_attributes.remove("repository");
-    badges.insert(String::from("gitlab"), test_badges.gitlab_attributes);
+    badges.insert(String::from("git-lab"), test_badges.gitlab_attributes);
 
     let invalid_badges = Badge::update_crate(&conn, &krate, Some(&badges)).unwrap();
     assert_eq!(invalid_badges.len(), 1);
-    assert!(invalid_badges.contains(&"gitlab"));
+    assert!(invalid_badges.contains(&"git-lab"));
     assert_eq!(krate.badges(&conn).unwrap(), vec![]);
 }