diff --git a/src/operator/softmax-inl.h b/src/operator/softmax_output-inl.h
similarity index 97%
rename from src/operator/softmax-inl.h
rename to src/operator/softmax_output-inl.h
index 5b26ef925184..737624af8960 100644
--- a/src/operator/softmax-inl.h
+++ b/src/operator/softmax_output-inl.h
@@ -1,11 +1,11 @@
 /*!
  * Copyright (c) 2015 by Contributors
- * \file softmax-inl.h
+ * \file softmax_output-inl.h
  * \brief
  * \author Bing Xu
 */
-#ifndef MXNET_OPERATOR_SOFTMAX_INL_H_
-#define MXNET_OPERATOR_SOFTMAX_INL_H_
+#ifndef MXNET_OPERATOR_SOFTMAX_OUTPUT_INL_H_
+#define MXNET_OPERATOR_SOFTMAX_OUTPUT_INL_H_
 
 #include <dmlc/logging.h>
 #include <dmlc/parameter.h>
@@ -193,4 +193,4 @@ class DeprecatedSoftmaxProp : public SoftmaxOutputProp {
 
 }  // namespace op
 }  // namespace mxnet
-#endif  // MXNET_OPERATOR_SOFTMAX_INL_H_
+#endif  // MXNET_OPERATOR_SOFTMAX_OUTPUT_INL_H_
diff --git a/src/operator/softmax.cc b/src/operator/softmax_output.cc
similarity index 93%
rename from src/operator/softmax.cc
rename to src/operator/softmax_output.cc
index 4b8a1649e065..bc1ba367ccaa 100644
--- a/src/operator/softmax.cc
+++ b/src/operator/softmax_output.cc
@@ -1,10 +1,10 @@
 /*!
  * Copyright (c) 2015 by Contributors
- * \file softmax.cc
+ * \file softmax_output.cc
  * \brief
  * \author Bing Xu
 */
-#include "./softmax-inl.h"
+#include "./softmax_output-inl.h"
 
 namespace mxnet {
 namespace op {
diff --git a/src/operator/softmax.cu b/src/operator/softmax_output.cu
similarity index 80%
rename from src/operator/softmax.cu
rename to src/operator/softmax_output.cu
index b2940f38fd61..02b92c041c47 100644
--- a/src/operator/softmax.cu
+++ b/src/operator/softmax_output.cu
@@ -1,11 +1,11 @@
 /*!
  * Copyright (c) 2015 by Contributors
- * \file softmax.cu
+ * \file softmax_output.cu
  * \brief
  * \author Bing Xu
 */
 
-#include "./softmax-inl.h"
+#include "./softmax_output-inl.h"
 
 namespace mxnet {
 namespace op {