diff --git a/src/librustc/ich/impls_ty.rs b/src/librustc/ich/impls_ty.rs
index dbd7175272a3..dd09af10bd93 100644
--- a/src/librustc/ich/impls_ty.rs
+++ b/src/librustc/ich/impls_ty.rs
@@ -753,7 +753,7 @@ impl<'a> HashStable<StableHashingContext<'a>> for ty::Generics {
     }
 }
 
-impl_stable_hash_for!(enum ty::GenericParameterDef {
+impl_stable_hash_for!(enum ty::GenericParam {
     Lifetime(lt),
     Type(ty)
 });
diff --git a/src/librustc/ty/mod.rs b/src/librustc/ty/mod.rs
index 8b69ba1780ec..81e188649b8c 100644
--- a/src/librustc/ty/mod.rs
+++ b/src/librustc/ty/mod.rs
@@ -758,16 +758,16 @@ impl ty::EarlyBoundRegion {
 }
 
 #[derive(Clone, Debug, RustcEncodable, RustcDecodable)]
-pub enum GenericParameterDef {
+pub enum GenericParam {
     Lifetime(RegionParameterDef),
     Type(TypeParameterDef),
 }
 
-impl GenericParameterDef {
+impl GenericParam {
     pub fn index(&self) -> u32 {
         match self {
-            GenericParameterDef::Lifetime(lt) => lt.index,
-            GenericParameterDef::Type(ty)     => ty.index,
+            GenericParam::Lifetime(lt) => lt.index,
+            GenericParam::Type(ty)     => ty.index,
         }
     }
 }
@@ -785,7 +785,7 @@ impl GenericParameterDef {
 pub struct Generics {
     pub parent: Option<DefId>,
     pub parent_count: usize,
-    pub params: Vec<GenericParameterDef>,
+    pub params: Vec<GenericParam>,
 
     /// Reverse map to each `TypeParameterDef`'s `index` field
     pub type_param_to_index: FxHashMap<DefId, u32>,
@@ -805,7 +805,7 @@ impl<'a, 'gcx, 'tcx> Generics {
 
     pub fn lifetimes(&self) -> Vec<&RegionParameterDef> {
         self.params.iter().filter_map(|p| {
-            if let GenericParameterDef::Lifetime(lt) = p {
+            if let GenericParam::Lifetime(lt) = p {
                 Some(lt)
             } else {
                 None
@@ -815,7 +815,7 @@ impl<'a, 'gcx, 'tcx> Generics {
 
     pub fn types(&self) -> Vec<&TypeParameterDef> {
         self.params.iter().filter_map(|p| {
-            if let GenericParameterDef::Type(ty) = p {
+            if let GenericParam::Type(ty) = p {
                 Some(ty)
             } else {
                 None
@@ -843,7 +843,7 @@ impl<'a, 'gcx, 'tcx> Generics {
         if let Some(index) = param.index.checked_sub(self.parent_count as u32) {
             // We're currently assuming that lifetimes precede other generic parameters.
             match self.params[index as usize - self.has_self as usize] {
-                ty::GenericParameterDef::Lifetime(ref lt) => lt,
+                ty::GenericParam::Lifetime(ref lt) => lt,
                 _ => bug!("expected region parameter, but found another generic parameter")
             }
         } else {
@@ -893,13 +893,13 @@ impl<'a, 'gcx, 'tcx> Generics {
             if let Some(_) = (idx as usize).checked_sub(type_param_offset) {
                 assert!(!is_separated_self, "found a Self after type_param_offset");
                 match self.params[idx as usize] {
-                    ty::GenericParameterDef::Type(ref ty) => ty,
+                    ty::GenericParam::Type(ref ty) => ty,
                     _ => bug!("expected type parameter, but found another generic parameter")
                 }
             } else {
                 assert!(is_separated_self, "non-Self param before type_param_offset");
                 match self.params[type_param_offset] {
-                    ty::GenericParameterDef::Type(ref ty) => ty,
+                    ty::GenericParam::Type(ref ty) => ty,
                     _ => bug!("expected type parameter, but found another generic parameter")
                 }
             }
diff --git a/src/librustc/ty/subst.rs b/src/librustc/ty/subst.rs
index a6960339fd4a..67cb2d829ff3 100644
--- a/src/librustc/ty/subst.rs
+++ b/src/librustc/ty/subst.rs
@@ -254,10 +254,10 @@ impl<'a, 'gcx, 'tcx> Substs<'tcx> {
 
         for def in &defs.params {
             let param = match def {
-                ty::GenericParameterDef::Lifetime(ref lt) => {
+                ty::GenericParam::Lifetime(ref lt) => {
                     UnpackedKind::Lifetime(mk_region(lt, substs))
                 }
-                ty::GenericParameterDef::Type(ref ty) => {
+                ty::GenericParam::Type(ref ty) => {
                     if skip_self {
                         skip_self = false;
                         continue
diff --git a/src/librustc_typeck/collect.rs b/src/librustc_typeck/collect.rs
index 6783f6f1987d..0fc47b93f8f9 100644
--- a/src/librustc_typeck/collect.rs
+++ b/src/librustc_typeck/collect.rs
@@ -970,10 +970,10 @@ fn generics_of<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
                                    .map(|param| (param.def_id, param.index))
                                    .collect();
 
-    let lifetimes: Vec<ty::GenericParameterDef> =
-        regions.into_iter().map(|lt| ty::GenericParameterDef::Lifetime(lt)).collect();
-    let types: Vec<ty::GenericParameterDef> =
-        types.into_iter().map(|ty| ty::GenericParameterDef::Type(ty)).collect();
+    let lifetimes: Vec<ty::GenericParam> =
+        regions.into_iter().map(|lt| ty::GenericParam::Lifetime(lt)).collect();
+    let types: Vec<ty::GenericParam> =
+        types.into_iter().map(|ty| ty::GenericParam::Type(ty)).collect();
     let params = lifetimes.into_iter().chain(types.into_iter()).collect();
 
     tcx.alloc_generics(ty::Generics {