diff --git a/native/jni/src/gesture/incremental_decoder_wrapper.cpp b/native/jni/src/gesture/typing_decoder_wrapper.cpp
similarity index 79%
rename from native/jni/src/gesture/incremental_decoder_wrapper.cpp
rename to native/jni/src/gesture/typing_decoder_wrapper.cpp
index f6e45623a..55dd1d4d9 100644
--- a/native/jni/src/gesture/incremental_decoder_wrapper.cpp
+++ b/native/jni/src/gesture/typing_decoder_wrapper.cpp
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include "incremental_decoder_wrapper.h"
+#include "typing_decoder_wrapper.h"
 
 namespace latinime {
     IncrementalDecoderInterface *
-            (*IncrementalDecoderWrapper::sIncrementalDecoderFactoryMethod)(int, int) = 0;
+            (*TypingDecoderWrapper::sIncrementalDecoderFactoryMethod)(int, int) = 0;
 
-    IncrementalDecoderWrapper::~IncrementalDecoderWrapper() {
+    TypingDecoderWrapper::~TypingDecoderWrapper() {
         delete mIncrementalDecoderInterface;
     }
 } // namespace latinime
diff --git a/native/jni/src/gesture/incremental_decoder_wrapper.h b/native/jni/src/gesture/typing_decoder_wrapper.h
similarity index 84%
rename from native/jni/src/gesture/incremental_decoder_wrapper.h
rename to native/jni/src/gesture/typing_decoder_wrapper.h
index c15b439fa..e974c8783 100644
--- a/native/jni/src/gesture/incremental_decoder_wrapper.h
+++ b/native/jni/src/gesture/typing_decoder_wrapper.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef LATINIME_INCREMENTAL_DECODER_WRAPPER_H
-#define LATINIME_INCREMENTAL_DECODER_WRAPPER_H
+#ifndef LATINIME_TYPING_DECODER_WRAPPER_H
+#define LATINIME_TYPING_DECODER_WRAPPER_H
 
 #include "defines.h"
 #include "incremental_decoder_interface.h"
@@ -26,13 +26,13 @@ class UnigramDictionary;
 class BigramDictionary;
 class ProximityInfo;
 
-class IncrementalDecoderWrapper : public IncrementalDecoderInterface {
+class TypingDecoderWrapper : public IncrementalDecoderInterface {
  public:
-    IncrementalDecoderWrapper(const int maxWordLength, const int maxWords)
+    TypingDecoderWrapper(const int maxWordLength, const int maxWords)
             : mIncrementalDecoderInterface(getIncrementalDecoderInstance(maxWordLength, maxWords)) {
     }
 
-    virtual ~IncrementalDecoderWrapper();
+    virtual ~TypingDecoderWrapper();
 
     int getSuggestions(ProximityInfo *pInfo, void *traverseSession, int *inputXs, int *inputYs,
             int *times, int *pointerIds, int *codes, int inputSize, int commitPoint, int *outWords,
@@ -51,7 +51,7 @@ class IncrementalDecoderWrapper : public IncrementalDecoderInterface {
     }
 
  private:
-    DISALLOW_IMPLICIT_CONSTRUCTORS(IncrementalDecoderWrapper);
+    DISALLOW_IMPLICIT_CONSTRUCTORS(TypingDecoderWrapper);
     static IncrementalDecoderInterface *getIncrementalDecoderInstance(int maxWordLength,
             int maxWords) {
         if (sIncrementalDecoderFactoryMethod) {
@@ -64,4 +64,4 @@ class IncrementalDecoderWrapper : public IncrementalDecoderInterface {
     IncrementalDecoderInterface *mIncrementalDecoderInterface;
 };
 } // namespace latinime
-#endif // LATINIME_INCREMENTAL_DECODER_WRAPPER_H
+#endif // LATINIME_TYPING_DECODER_WRAPPER_H