diff --git a/src/main/java/org/elasticsearch/indices/analysis/KuromojiIndicesAnalysis.java b/src/main/java/org/elasticsearch/indices/analysis/KuromojiIndicesAnalysis.java
index 9264acd9426..7074fcadac0 100644
--- a/src/main/java/org/elasticsearch/indices/analysis/KuromojiIndicesAnalysis.java
+++ b/src/main/java/org/elasticsearch/indices/analysis/KuromojiIndicesAnalysis.java
@@ -43,7 +43,7 @@ public class KuromojiIndicesAnalysis extends AbstractComponent {
         super(settings);
 
         indicesAnalysisService.charFilterFactories().put("kuromoji_iteration_mark",
-                new PreBuiltCharFilterFactoryFactory(new CharFilterFactory() {
+                new KurumojiCharFilterFactoryFactory(new CharFilterFactory() {
                     @Override
                     public String name() {
                         return "kuromoji_iteration_mark";
@@ -58,7 +58,7 @@ public class KuromojiIndicesAnalysis extends AbstractComponent {
                 }));
 
         indicesAnalysisService.tokenizerFactories().put("kuromoji_tokenizer",
-                new PreBuiltTokenizerFactoryFactory(new TokenizerFactory() {
+                new KurumojiTokenizerFactoryFactory(new TokenizerFactory() {
                     @Override
                     public String name() {
                         return "kuromoji_tokenizer";
@@ -72,7 +72,7 @@ public class KuromojiIndicesAnalysis extends AbstractComponent {
                 }));
 
         indicesAnalysisService.tokenFilterFactories().put("kuromoji_baseform",
-                new PreBuiltTokenFilterFactoryFactory(new TokenFilterFactory() {
+                new KurumojiTokenFilterFactoryFactory(new TokenFilterFactory() {
                     @Override
                     public String name() {
                         return "kuromoji_baseform";
@@ -86,7 +86,7 @@ public class KuromojiIndicesAnalysis extends AbstractComponent {
 
         indicesAnalysisService.tokenFilterFactories().put(
                 "kuromoji_part_of_speech",
-                new PreBuiltTokenFilterFactoryFactory(new TokenFilterFactory() {
+                new KurumojiTokenFilterFactoryFactory(new TokenFilterFactory() {
                     @Override
                     public String name() {
                         return "kuromoji_part_of_speech";
@@ -102,7 +102,7 @@ public class KuromojiIndicesAnalysis extends AbstractComponent {
 
         indicesAnalysisService.tokenFilterFactories().put(
                 "kuromoji_readingform",
-                new PreBuiltTokenFilterFactoryFactory(new TokenFilterFactory() {
+                new KurumojiTokenFilterFactoryFactory(new TokenFilterFactory() {
                     @Override
                     public String name() {
                         return "kuromoji_readingform";
@@ -115,7 +115,7 @@ public class KuromojiIndicesAnalysis extends AbstractComponent {
                 }));
 
         indicesAnalysisService.tokenFilterFactories().put("kuromoji_stemmer",
-                new PreBuiltTokenFilterFactoryFactory(new TokenFilterFactory() {
+                new KurumojiTokenFilterFactoryFactory(new TokenFilterFactory() {
                     @Override
                     public String name() {
                         return "kuromoji_stemmer";
diff --git a/src/main/java/org/elasticsearch/indices/analysis/KurumojiCharFilterFactoryFactory.java b/src/main/java/org/elasticsearch/indices/analysis/KurumojiCharFilterFactoryFactory.java
new file mode 100644
index 00000000000..3737d81f1a7
--- /dev/null
+++ b/src/main/java/org/elasticsearch/indices/analysis/KurumojiCharFilterFactoryFactory.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to Elasticsearch (the "Author") under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. Author licenses this
+ * file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.indices.analysis;
+
+import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.index.analysis.CharFilterFactory;
+import org.elasticsearch.index.analysis.PreBuiltCharFilterFactoryFactory;
+
+public class KurumojiCharFilterFactoryFactory extends PreBuiltCharFilterFactoryFactory {
+    private final CharFilterFactory charFilterFactory;
+
+    public KurumojiCharFilterFactoryFactory(CharFilterFactory charFilterFactory) {
+        super(charFilterFactory);
+        this.charFilterFactory = charFilterFactory;
+    }
+
+    @Override
+    public CharFilterFactory create(String name, Settings settings) {
+        return charFilterFactory;
+    }
+}
diff --git a/src/main/java/org/elasticsearch/indices/analysis/KurumojiTokenFilterFactoryFactory.java b/src/main/java/org/elasticsearch/indices/analysis/KurumojiTokenFilterFactoryFactory.java
new file mode 100644
index 00000000000..2efaa91baa0
--- /dev/null
+++ b/src/main/java/org/elasticsearch/indices/analysis/KurumojiTokenFilterFactoryFactory.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to Elasticsearch (the "Author") under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. Author licenses this
+ * file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.indices.analysis;
+
+import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.index.analysis.PreBuiltTokenFilterFactoryFactory;
+import org.elasticsearch.index.analysis.TokenFilterFactory;
+
+public class KurumojiTokenFilterFactoryFactory extends PreBuiltTokenFilterFactoryFactory {
+    private final TokenFilterFactory tokenFilterFactory;
+
+    public KurumojiTokenFilterFactoryFactory(TokenFilterFactory tokenFilterFactory) {
+        super(tokenFilterFactory);
+        this.tokenFilterFactory = tokenFilterFactory;
+    }
+
+    @Override
+    public TokenFilterFactory create(String name, Settings settings) {
+        return tokenFilterFactory;
+    }
+}
diff --git a/src/main/java/org/elasticsearch/indices/analysis/KurumojiTokenizerFactoryFactory.java b/src/main/java/org/elasticsearch/indices/analysis/KurumojiTokenizerFactoryFactory.java
new file mode 100644
index 00000000000..6e5525762ff
--- /dev/null
+++ b/src/main/java/org/elasticsearch/indices/analysis/KurumojiTokenizerFactoryFactory.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to Elasticsearch (the "Author") under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. Author licenses this
+ * file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.indices.analysis;
+
+import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.index.analysis.PreBuiltTokenizerFactoryFactory;
+import org.elasticsearch.index.analysis.TokenizerFactory;
+
+public class KurumojiTokenizerFactoryFactory extends PreBuiltTokenizerFactoryFactory {
+    private final TokenizerFactory tokenizerFactory;
+
+    public KurumojiTokenizerFactoryFactory(TokenizerFactory tokenizerFactory) {
+        super(tokenizerFactory);
+        this.tokenizerFactory = tokenizerFactory;
+    }
+
+    @Override
+    public TokenizerFactory create(String name, Settings settings) {
+        return tokenizerFactory;
+    }
+}