diff --git a/src/librustc_trans/mir/block.rs b/src/librustc_trans/mir/block.rs
index cc344fdf063a..9d70f8669b2c 100644
--- a/src/librustc_trans/mir/block.rs
+++ b/src/librustc_trans/mir/block.rs
@@ -530,7 +530,7 @@ impl<'a, 'tcx> FunctionCx<'a, 'tcx> {
                                     span_bug!(span, "shuffle indices must be constant");
                                 }
                                 mir::Operand::Constant(ref constant) => {
-                                    let (llval, ty) = self.remove_me_shuffle_indices(
+                                    let (llval, ty) = self.simd_shuffle_indices(
                                         &bx,
                                         constant,
                                     );
diff --git a/src/librustc_trans/mir/constant.rs b/src/librustc_trans/mir/constant.rs
index 954abf4c5d70..1b470665cd9c 100644
--- a/src/librustc_trans/mir/constant.rs
+++ b/src/librustc_trans/mir/constant.rs
@@ -184,12 +184,12 @@ impl<'a, 'tcx> FunctionCx<'a, 'tcx> {
         }.and_then(|c| self.const_to_miri_value(bx, c))
     }
 
-    // Old version of trans_constant now used just for SIMD shuffle
-    pub fn remove_me_shuffle_indices(&mut self,
-                                      bx: &Builder<'a, 'tcx>,
-                                      constant: &mir::Constant<'tcx>)
-                                      -> (ValueRef, Ty<'tcx>)
-    {
+    /// process constant containing SIMD shuffle indices
+    pub fn simd_shuffle_indices(
+        &mut self,
+        bx: &Builder<'a, 'tcx>,
+        constant: &mir::Constant<'tcx>,
+    ) -> (ValueRef, Ty<'tcx>) {
         let layout = bx.cx.layout_of(constant.ty);
         self.mir_constant_to_miri_value(bx, constant)
             .and_then(|c| {