diff --git a/plugin.xml b/plugin.xml
index 52d94f285d2bd2e8107e520ada1830fc4aa3dd2e..feaad4e97dbe18ad4664e587c23941d3160336d2 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -6,7 +6,7 @@
 	<!-- Maven Repository -->
 	<property name="maven.snapshot.repo.url" value="https://oss.sonatype.org/content/repositories/snapshots" />
 	<property name="maven.release.repo.url" value="https://oss.sonatype.org/content/repositories/releases" />
-	<property name="use.fesen" value="" />
+	<property name="use.opensearch" value="" />
 	<property name="name.prefix" value="elasticsearch" />
 
 	<target name="install.plugins">
@@ -16,38 +16,38 @@
 		<!-- analysis-extension -->
 		<antcall target="install.plugin">
 			<param name="repo.url" value="${maven.release.repo.url}" />
-			<param name="plugin.groupId" value="org/codelibs${use.fesen}" />
+			<param name="plugin.groupId" value="org/codelibs${use.opensearch}" />
 			<param name="plugin.name.prefix" value="${name.prefix}-" />
 			<param name="plugin.name" value="analysis-extension" />
-			<param name="plugin.version" value="0.15.0" />
-			<param name="plugin.zip.version" value="0.15.0" />
+			<param name="plugin.version" value="1.2.0" />
+			<param name="plugin.zip.version" value="1.2.0" />
 		</antcall>
 		<!-- analysis-fess -->
 		<antcall target="install.plugin">
 			<param name="repo.url" value="${maven.release.repo.url}" />
-			<param name="plugin.groupId" value="org/codelibs${use.fesen}" />
+			<param name="plugin.groupId" value="org/codelibs${use.opensearch}" />
 			<param name="plugin.name.prefix" value="${name.prefix}-" />
 			<param name="plugin.name" value="analysis-fess" />
-			<param name="plugin.version" value="0.15.0" />
-			<param name="plugin.zip.version" value="0.15.0" />
+			<param name="plugin.version" value="1.2.0" />
+			<param name="plugin.zip.version" value="1.2.0" />
 		</antcall>
 		<!-- configsync -->
 		<antcall target="install.plugin">
 			<param name="repo.url" value="${maven.release.repo.url}" />
-			<param name="plugin.groupId" value="org/codelibs${use.fesen}" />
+			<param name="plugin.groupId" value="org/codelibs${use.opensearch}" />
 			<param name="plugin.name.prefix" value="${name.prefix}-" />
 			<param name="plugin.name" value="configsync" />
-			<param name="plugin.version" value="0.15.0" />
-			<param name="plugin.zip.version" value="0.15.0" />
+			<param name="plugin.version" value="1.2.0" />
+			<param name="plugin.zip.version" value="1.2.0" />
 		</antcall>
 		<!-- minhash -->
 		<antcall target="install.plugin">
 			<param name="repo.url" value="${maven.release.repo.url}" />
-			<param name="plugin.groupId" value="org/codelibs${use.fesen}" />
+			<param name="plugin.groupId" value="org/codelibs${use.opensearch}" />
 			<param name="plugin.name.prefix" value="${name.prefix}-" />
 			<param name="plugin.name" value="minhash" />
-			<param name="plugin.version" value="0.15.0" />
-			<param name="plugin.zip.version" value="0.15.0" />
+			<param name="plugin.version" value="1.2.0" />
+			<param name="plugin.zip.version" value="1.2.0" />
 		</antcall>
 
 		<antcall target="remove.jars" />
diff --git a/pom.xml b/pom.xml
index 6282acf92353ba23f08621eb0339d47f6842e2ec..a1e44cd49d012c9ec55e9ed0222cda22c787b2ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
 		<packaging.fess.systemd.dir>/usr/lib/systemd/system</packaging.fess.systemd.dir>
 		<packaging.fess.systemd.sysctl.dir>/usr/lib/sysctl.d</packaging.fess.systemd.sysctl.dir>
 		<packaging.fess.tmpfilesd.dir>/usr/lib/tmpfiles.d</packaging.fess.tmpfilesd.dir>
-		<packaging.fess.dictionary.dir>/var/lib/fesen/config</packaging.fess.dictionary.dir>
+		<packaging.fess.dictionary.dir>/var/lib/fess/config</packaging.fess.dictionary.dir>
 	</properties>
 	<profiles>
 		<profile>
@@ -215,8 +215,8 @@
 						<ant antfile="${basedir}/dbflute.xml" target="download.dbflute" />
 						<ant antfile="${basedir}/plugin.xml" target="install.plugins">
 							<property name="with.fess" value="true" />
-							<property name="use.fesen" value="/fesen" />
-							<property name="name.prefix" value="fesen" />
+							<property name="use.opensearch" value="/opensearch" />
+							<property name="name.prefix" value="opensearch" />
 						</ant>
 						<ant antfile="deps.xml" target="install.jars" />
 						<echo message="fess.version=${project.version}" file="${basedir}/src/main/webapp/WEB-INF/project.properties" />
@@ -972,16 +972,16 @@
 			<version>${log4j.version}</version>
 		</dependency>
 
-		<!-- fesen -->
+		<!-- opensearch -->
 		<dependency>
-			<groupId>org.codelibs.fesen</groupId>
-			<artifactId>fesen-engine-server</artifactId>
-			<version>${fesen.version}</version>
+			<groupId>org.opensearch</groupId>
+			<artifactId>opensearch</artifactId>
+			<version>${opensearch.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.codelibs.fesen</groupId>
-			<artifactId>fesen-runner</artifactId>
-			<version>${fesen.runner.version}</version>
+			<groupId>org.codelibs.opensearch</groupId>
+			<artifactId>opensearch-runner</artifactId>
+			<version>${opensearch.runner.version}</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.ow2.asm</groupId>
diff --git a/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java b/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java
index 94b7d34a0b2ccd8fca8b46209dee6cc8f112d3b9..010ba17619e5ca3e5ff57d327cf21d9ea5511359 100644
--- a/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java
+++ b/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java
@@ -34,7 +34,6 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.exception.IORuntimeException;
 import org.codelibs.core.lang.StringUtil;
-import org.codelibs.fesen.script.Script;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.api.BaseJsonApiManager;
 import org.codelibs.fess.app.service.FavoriteLogService;
@@ -60,6 +59,7 @@ import org.codelibs.fess.util.DocumentUtil;
 import org.codelibs.fess.util.FacetResponse;
 import org.codelibs.fess.util.FacetResponse.Field;
 import org.dbflute.optional.OptionalThing;
+import org.opensearch.script.Script;
 
 public class JsonApiManager extends BaseJsonApiManager {
 
diff --git a/src/main/java/org/codelibs/fess/app/service/SearchLogService.java b/src/main/java/org/codelibs/fess/app/service/SearchLogService.java
index 59876e71cabc77a711cf5a659a91c7ea449b5f25..0d8b8056c4f69c80a2a6b3bd99a210352503d790 100644
--- a/src/main/java/org/codelibs/fess/app/service/SearchLogService.java
+++ b/src/main/java/org/codelibs/fess/app/service/SearchLogService.java
@@ -33,13 +33,6 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
-import org.codelibs.fesen.search.aggregations.AggregationBuilders;
-import org.codelibs.fesen.search.aggregations.BucketOrder;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.DateHistogramInterval;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.Histogram;
-import org.codelibs.fesen.search.aggregations.bucket.terms.Terms;
-import org.codelibs.fesen.search.aggregations.metrics.Avg;
-import org.codelibs.fesen.search.aggregations.metrics.Cardinality;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.SearchLogPager;
 import org.codelibs.fess.es.log.allcommon.EsPagingResultBean;
@@ -60,6 +53,13 @@ import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.taglib.FessFunctions;
 import org.dbflute.optional.OptionalEntity;
+import org.opensearch.search.aggregations.AggregationBuilders;
+import org.opensearch.search.aggregations.BucketOrder;
+import org.opensearch.search.aggregations.bucket.histogram.DateHistogramInterval;
+import org.opensearch.search.aggregations.bucket.histogram.Histogram;
+import org.opensearch.search.aggregations.bucket.terms.Terms;
+import org.opensearch.search.aggregations.metrics.Avg;
+import org.opensearch.search.aggregations.metrics.Cardinality;
 
 public class SearchLogService {
 
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/maintenance/AdminMaintenanceAction.java b/src/main/java/org/codelibs/fess/app/web/admin/maintenance/AdminMaintenanceAction.java
index 8d49bc9e3fa3ec4c092f9634c01d3a0611140954..4736c957990729d0ef174612646af4a60bbd1cf3 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/maintenance/AdminMaintenanceAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/maintenance/AdminMaintenanceAction.java
@@ -36,7 +36,6 @@ import org.apache.logging.log4j.Logger;
 import org.codelibs.core.io.CopyUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.curl.CurlResponse;
-import org.codelibs.fesen.action.ActionListener;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.annotation.Secured;
 import org.codelibs.fess.app.web.base.FessAdminAction;
@@ -48,6 +47,7 @@ import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.ActionResponse;
 import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.ruts.process.ActionRuntime;
+import org.opensearch.action.ActionListener;
 
 public class AdminMaintenanceAction extends FessAdminAction {
 
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java
index f9412439b712e5e623818a0236ab7ef5639ea020..ca36869a99f698ff60f6cb5040311e13f04c54d5 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java
@@ -27,8 +27,6 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.net.URLUtil;
-import org.codelibs.fesen.index.query.QueryBuilder;
-import org.codelibs.fesen.index.query.QueryBuilders;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.annotation.Secured;
 import org.codelibs.fess.app.web.CrudMode;
@@ -50,6 +48,8 @@ import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.ruts.process.ActionRuntime;
 import org.lastaflute.web.validation.VaMessenger;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
 
 /**
  * @author shinsuke
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/ApiAdminSearchlistAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/ApiAdminSearchlistAction.java
index 18636d3cb5e7c5ec0af069843c1d3208b17c212f..4db509cbb1372a3104c1db6a37d55feef0cfb19e 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/ApiAdminSearchlistAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/ApiAdminSearchlistAction.java
@@ -25,8 +25,6 @@ import javax.annotation.Resource;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.lang.StringUtil;
-import org.codelibs.fesen.index.query.QueryBuilder;
-import org.codelibs.fesen.index.query.QueryBuilders;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.api.ApiResult;
@@ -45,6 +43,8 @@ import org.codelibs.fess.helper.SearchHelper;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
 
 /**
  * @author shinsuke
diff --git a/src/main/java/org/codelibs/fess/dict/DictionaryManager.java b/src/main/java/org/codelibs/fess/dict/DictionaryManager.java
index eb59f6793ecf561dd3452720fd4c0514d14b4dd3..aed6b1db6f6e3388030c131b2bbee810a3a3bbf2 100644
--- a/src/main/java/org/codelibs/fess/dict/DictionaryManager.java
+++ b/src/main/java/org/codelibs/fess/dict/DictionaryManager.java
@@ -29,9 +29,9 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.io.FileUtil;
 import org.codelibs.curl.CurlResponse;
-import org.codelibs.fesen.runner.net.FesenCurl;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.util.ComponentUtil;
+import org.codelibs.opensearch.runner.net.OpenSearchCurl;
 import org.dbflute.optional.OptionalEntity;
 
 public class DictionaryManager {
@@ -52,7 +52,7 @@ public class DictionaryManager {
     public DictionaryFile<? extends DictionaryItem>[] getDictionaryFiles() {
         try (CurlResponse response = ComponentUtil.getCurlHelper().get("/_configsync/file").param("fields", "path,@timestamp")
                 .param("size", ComponentUtil.getFessConfig().getPageDictionaryMaxFetchSize()).execute()) {
-            final Map<String, Object> contentMap = response.getContent(FesenCurl.jsonParser());
+            final Map<String, Object> contentMap = response.getContent(OpenSearchCurl.jsonParser());
             @SuppressWarnings("unchecked")
             final List<Map<String, Object>> fileList = (List<Map<String, Object>>) contentMap.get("file");
             return fileList.stream().map(fileMap -> {
@@ -94,7 +94,7 @@ public class DictionaryManager {
             // TODO use stream
             try (CurlResponse response = ComponentUtil.getCurlHelper().post("/_configsync/file").param("path", dictFile.getPath())
                     .body(FileUtil.readUTF8(file)).execute()) {
-                final Map<String, Object> contentMap = response.getContent(FesenCurl.jsonParser());
+                final Map<String, Object> contentMap = response.getContent(OpenSearchCurl.jsonParser());
                 if (!Constants.TRUE.equalsIgnoreCase(contentMap.get("acknowledged").toString())) {
                     throw new DictionaryException("Failed to update " + dictFile.getPath());
                 }
diff --git a/src/main/java/org/codelibs/fess/ds/callback/FileListIndexUpdateCallbackImpl.java b/src/main/java/org/codelibs/fess/ds/callback/FileListIndexUpdateCallbackImpl.java
index 2722a1cfe89ec778c396796ee5c248bccf67843a..fce3d510b68e2ae5498d47dfcf41db793cbb1299 100644
--- a/src/main/java/org/codelibs/fess/ds/callback/FileListIndexUpdateCallbackImpl.java
+++ b/src/main/java/org/codelibs/fess/ds/callback/FileListIndexUpdateCallbackImpl.java
@@ -31,7 +31,6 @@ import java.util.stream.Collectors;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.io.SerializeUtil;
-import org.codelibs.fesen.index.query.QueryBuilders;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.crawler.builder.RequestDataBuilder;
 import org.codelibs.fess.crawler.client.CrawlerClient;
@@ -52,6 +51,7 @@ import org.codelibs.fess.helper.IndexingHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.di.core.SingletonLaContainer;
+import org.opensearch.index.query.QueryBuilders;
 
 public class FileListIndexUpdateCallbackImpl implements IndexUpdateCallback {
     private static final Logger logger = LogManager.getLogger(FileListIndexUpdateCallbackImpl.class);
diff --git a/src/main/java/org/codelibs/fess/entity/FacetInfo.java b/src/main/java/org/codelibs/fess/entity/FacetInfo.java
index 0b513c1804fadd35259a3f7d01080bca2c974a6a..e8d0da359745ca7cb87cb3de8bba7b70235b7508 100644
--- a/src/main/java/org/codelibs/fess/entity/FacetInfo.java
+++ b/src/main/java/org/codelibs/fess/entity/FacetInfo.java
@@ -23,9 +23,9 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.stream.StreamUtil;
-import org.codelibs.fesen.search.aggregations.BucketOrder;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.util.ComponentUtil;
+import org.opensearch.search.aggregations.BucketOrder;
 
 public class FacetInfo {
     private static final Logger logger = LogManager.getLogger(FacetInfo.class);
diff --git a/src/main/java/org/codelibs/fess/entity/GeoInfo.java b/src/main/java/org/codelibs/fess/entity/GeoInfo.java
index 97102bc168b3b460554363b84e6fd721ce7d4320..38918be12e8c8ab20b5590ad5d6216305970ca8c 100644
--- a/src/main/java/org/codelibs/fess/entity/GeoInfo.java
+++ b/src/main/java/org/codelibs/fess/entity/GeoInfo.java
@@ -25,13 +25,13 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 
 import org.codelibs.core.lang.StringUtil;
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
-import org.codelibs.fesen.index.query.QueryBuilders;
 import org.codelibs.fess.exception.InvalidQueryException;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.core.message.UserMessages;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
 
 public class GeoInfo {
 
diff --git a/src/main/java/org/codelibs/fess/entity/PingResponse.java b/src/main/java/org/codelibs/fess/entity/PingResponse.java
index 11e42d3b67d5ebadbe5a30b01b9049b816abba31..2d37f12230ad8cdbb6cd032f4a1c5db2e9ed9f2c 100644
--- a/src/main/java/org/codelibs/fess/entity/PingResponse.java
+++ b/src/main/java/org/codelibs/fess/entity/PingResponse.java
@@ -22,11 +22,11 @@ import java.util.Locale;
 
 import org.apache.commons.text.StringEscapeUtils;
 import org.codelibs.core.lang.StringUtil;
-import org.codelibs.fesen.action.admin.cluster.health.ClusterHealthResponse;
-import org.codelibs.fesen.cluster.health.ClusterHealthStatus;
-import org.codelibs.fesen.common.xcontent.XContentType;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.util.SearchEngineUtil;
+import org.opensearch.action.admin.cluster.health.ClusterHealthResponse;
+import org.opensearch.cluster.health.ClusterHealthStatus;
+import org.opensearch.common.xcontent.XContentType;
 
 public class PingResponse {
     private static final String CLUSTER_NAME = "cluster_name";
diff --git a/src/main/java/org/codelibs/fess/entity/QueryContext.java b/src/main/java/org/codelibs/fess/entity/QueryContext.java
index 8703cc22ac1ec8d7b54176d8c884a5491a2a6b86..214d5251741fbfb3a81a41b4e75363a949e54439 100644
--- a/src/main/java/org/codelibs/fess/entity/QueryContext.java
+++ b/src/main/java/org/codelibs/fess/entity/QueryContext.java
@@ -27,15 +27,15 @@ import java.util.Set;
 import java.util.function.Consumer;
 
 import org.codelibs.core.lang.StringUtil;
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.MatchAllQueryBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
-import org.codelibs.fesen.index.query.QueryBuilders;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
-import org.codelibs.fesen.search.sort.SortBuilder;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.util.LaRequestUtil;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.MatchAllQueryBuilder;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
+import org.opensearch.search.sort.SortBuilder;
 
 public class QueryContext {
 
diff --git a/src/main/java/org/codelibs/fess/es/client/CrawlerEngineClient.java b/src/main/java/org/codelibs/fess/es/client/CrawlerEngineClient.java
index fbd1ee0d8bc5b6bbe5ea0a66223caa147e11df74..c9632bb624703917cfa0c986a5c6af9d518e4136 100644
--- a/src/main/java/org/codelibs/fess/es/client/CrawlerEngineClient.java
+++ b/src/main/java/org/codelibs/fess/es/client/CrawlerEngineClient.java
@@ -16,14 +16,14 @@
 package org.codelibs.fess.es.client;
 
 import org.codelibs.core.lang.StringUtil;
-import org.codelibs.fesen.client.Client;
 import org.codelibs.fesen.client.HttpClient;
-import org.codelibs.fesen.common.settings.Settings;
-import org.codelibs.fesen.common.settings.Settings.Builder;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.crawler.client.FesenClient;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.util.ComponentUtil;
+import org.opensearch.client.Client;
+import org.opensearch.common.settings.Settings;
+import org.opensearch.common.settings.Settings.Builder;
 
 public class CrawlerEngineClient extends FesenClient {
     @Override
diff --git a/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java b/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java
index ae5f2f77a849606542bcf9d34e071e49065765e9..b435271059ad071bf7fde7b964465c7c35cfdd1b 100644
--- a/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java
+++ b/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java
@@ -17,7 +17,7 @@ package org.codelibs.fess.es.client;
 
 import static org.codelibs.core.stream.StreamUtil.split;
 import static org.codelibs.core.stream.StreamUtil.stream;
-import static org.codelibs.fesen.runner.FesenRunner.newConfigs;
+import static org.codelibs.opensearch.runner.OpenSearchRunner.newConfigs;
 
 import java.io.File;
 import java.io.IOException;
@@ -51,94 +51,7 @@ import org.codelibs.core.io.ResourceUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.lang.ThreadUtil;
 import org.codelibs.curl.CurlResponse;
-import org.codelibs.fesen.FesenException;
-import org.codelibs.fesen.FesenStatusException;
-import org.codelibs.fesen.action.ActionFuture;
-import org.codelibs.fesen.action.ActionListener;
-import org.codelibs.fesen.action.ActionRequest;
-import org.codelibs.fesen.action.ActionResponse;
-import org.codelibs.fesen.action.ActionType;
-import org.codelibs.fesen.action.DocWriteRequest;
-import org.codelibs.fesen.action.DocWriteRequest.OpType;
-import org.codelibs.fesen.action.DocWriteResponse.Result;
-import org.codelibs.fesen.action.admin.cluster.health.ClusterHealthResponse;
-import org.codelibs.fesen.action.admin.indices.alias.IndicesAliasesRequestBuilder;
-import org.codelibs.fesen.action.admin.indices.create.CreateIndexResponse;
-import org.codelibs.fesen.action.admin.indices.exists.indices.IndicesExistsResponse;
-import org.codelibs.fesen.action.admin.indices.flush.FlushResponse;
-import org.codelibs.fesen.action.admin.indices.get.GetIndexResponse;
-import org.codelibs.fesen.action.admin.indices.mapping.get.GetMappingsResponse;
-import org.codelibs.fesen.action.admin.indices.refresh.RefreshResponse;
-import org.codelibs.fesen.action.bulk.BulkItemResponse;
-import org.codelibs.fesen.action.bulk.BulkItemResponse.Failure;
-import org.codelibs.fesen.action.bulk.BulkRequest;
-import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
-import org.codelibs.fesen.action.bulk.BulkResponse;
-import org.codelibs.fesen.action.delete.DeleteRequest;
-import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
-import org.codelibs.fesen.action.delete.DeleteResponse;
-import org.codelibs.fesen.action.explain.ExplainRequest;
-import org.codelibs.fesen.action.explain.ExplainRequestBuilder;
-import org.codelibs.fesen.action.explain.ExplainResponse;
-import org.codelibs.fesen.action.fieldcaps.FieldCapabilitiesRequest;
-import org.codelibs.fesen.action.fieldcaps.FieldCapabilitiesRequestBuilder;
-import org.codelibs.fesen.action.fieldcaps.FieldCapabilitiesResponse;
-import org.codelibs.fesen.action.get.GetRequest;
-import org.codelibs.fesen.action.get.GetRequestBuilder;
-import org.codelibs.fesen.action.get.GetResponse;
-import org.codelibs.fesen.action.get.MultiGetRequest;
-import org.codelibs.fesen.action.get.MultiGetRequestBuilder;
-import org.codelibs.fesen.action.get.MultiGetResponse;
-import org.codelibs.fesen.action.index.IndexRequest;
-import org.codelibs.fesen.action.index.IndexRequestBuilder;
-import org.codelibs.fesen.action.index.IndexResponse;
-import org.codelibs.fesen.action.search.ClearScrollRequest;
-import org.codelibs.fesen.action.search.ClearScrollRequestBuilder;
-import org.codelibs.fesen.action.search.ClearScrollResponse;
-import org.codelibs.fesen.action.search.MultiSearchRequest;
-import org.codelibs.fesen.action.search.MultiSearchRequestBuilder;
-import org.codelibs.fesen.action.search.MultiSearchResponse;
-import org.codelibs.fesen.action.search.SearchPhaseExecutionException;
-import org.codelibs.fesen.action.search.SearchRequest;
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.action.search.SearchResponse;
-import org.codelibs.fesen.action.search.SearchScrollRequest;
-import org.codelibs.fesen.action.search.SearchScrollRequestBuilder;
-import org.codelibs.fesen.action.support.WriteRequest.RefreshPolicy;
-import org.codelibs.fesen.action.support.master.AcknowledgedResponse;
-import org.codelibs.fesen.action.termvectors.MultiTermVectorsRequest;
-import org.codelibs.fesen.action.termvectors.MultiTermVectorsRequestBuilder;
-import org.codelibs.fesen.action.termvectors.MultiTermVectorsResponse;
-import org.codelibs.fesen.action.termvectors.TermVectorsRequest;
-import org.codelibs.fesen.action.termvectors.TermVectorsRequestBuilder;
-import org.codelibs.fesen.action.termvectors.TermVectorsResponse;
-import org.codelibs.fesen.action.update.UpdateRequest;
-import org.codelibs.fesen.action.update.UpdateRequestBuilder;
-import org.codelibs.fesen.action.update.UpdateResponse;
-import org.codelibs.fesen.client.AdminClient;
-import org.codelibs.fesen.client.Client;
 import org.codelibs.fesen.client.HttpClient;
-import org.codelibs.fesen.cluster.metadata.MappingMetadata;
-import org.codelibs.fesen.common.collect.ImmutableOpenMap;
-import org.codelibs.fesen.common.document.DocumentField;
-import org.codelibs.fesen.common.settings.Settings;
-import org.codelibs.fesen.common.settings.Settings.Builder;
-import org.codelibs.fesen.common.xcontent.XContentType;
-import org.codelibs.fesen.core.TimeValue;
-import org.codelibs.fesen.index.query.InnerHitBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
-import org.codelibs.fesen.index.query.QueryBuilders;
-import org.codelibs.fesen.rest.RestStatus;
-import org.codelibs.fesen.runner.FesenRunner;
-import org.codelibs.fesen.runner.FesenRunner.Configs;
-import org.codelibs.fesen.search.SearchHit;
-import org.codelibs.fesen.search.SearchHits;
-import org.codelibs.fesen.search.aggregations.AggregationBuilders;
-import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.codelibs.fesen.search.collapse.CollapseBuilder;
-import org.codelibs.fesen.search.fetch.subphase.highlight.HighlightBuilder;
-import org.codelibs.fesen.threadpool.ThreadPool;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.entity.FacetInfo;
 import org.codelibs.fess.entity.GeoInfo;
@@ -156,10 +69,97 @@ import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.util.BooleanFunction;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.DocMap;
+import org.codelibs.opensearch.runner.OpenSearchRunner;
+import org.codelibs.opensearch.runner.OpenSearchRunner.Configs;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.lastaflute.core.message.UserMessages;
 import org.lastaflute.di.exception.ContainerInitFailureException;
+import org.opensearch.OpenSearchException;
+import org.opensearch.OpenSearchStatusException;
+import org.opensearch.action.ActionFuture;
+import org.opensearch.action.ActionListener;
+import org.opensearch.action.ActionRequest;
+import org.opensearch.action.ActionResponse;
+import org.opensearch.action.ActionType;
+import org.opensearch.action.DocWriteRequest;
+import org.opensearch.action.DocWriteRequest.OpType;
+import org.opensearch.action.DocWriteResponse.Result;
+import org.opensearch.action.admin.cluster.health.ClusterHealthResponse;
+import org.opensearch.action.admin.indices.alias.IndicesAliasesRequestBuilder;
+import org.opensearch.action.admin.indices.create.CreateIndexResponse;
+import org.opensearch.action.admin.indices.exists.indices.IndicesExistsResponse;
+import org.opensearch.action.admin.indices.flush.FlushResponse;
+import org.opensearch.action.admin.indices.get.GetIndexResponse;
+import org.opensearch.action.admin.indices.mapping.get.GetMappingsResponse;
+import org.opensearch.action.admin.indices.refresh.RefreshResponse;
+import org.opensearch.action.bulk.BulkItemResponse;
+import org.opensearch.action.bulk.BulkItemResponse.Failure;
+import org.opensearch.action.bulk.BulkRequest;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.bulk.BulkResponse;
+import org.opensearch.action.delete.DeleteRequest;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.delete.DeleteResponse;
+import org.opensearch.action.explain.ExplainRequest;
+import org.opensearch.action.explain.ExplainRequestBuilder;
+import org.opensearch.action.explain.ExplainResponse;
+import org.opensearch.action.fieldcaps.FieldCapabilitiesRequest;
+import org.opensearch.action.fieldcaps.FieldCapabilitiesRequestBuilder;
+import org.opensearch.action.fieldcaps.FieldCapabilitiesResponse;
+import org.opensearch.action.get.GetRequest;
+import org.opensearch.action.get.GetRequestBuilder;
+import org.opensearch.action.get.GetResponse;
+import org.opensearch.action.get.MultiGetRequest;
+import org.opensearch.action.get.MultiGetRequestBuilder;
+import org.opensearch.action.get.MultiGetResponse;
+import org.opensearch.action.index.IndexRequest;
+import org.opensearch.action.index.IndexRequestBuilder;
+import org.opensearch.action.index.IndexResponse;
+import org.opensearch.action.search.ClearScrollRequest;
+import org.opensearch.action.search.ClearScrollRequestBuilder;
+import org.opensearch.action.search.ClearScrollResponse;
+import org.opensearch.action.search.MultiSearchRequest;
+import org.opensearch.action.search.MultiSearchRequestBuilder;
+import org.opensearch.action.search.MultiSearchResponse;
+import org.opensearch.action.search.SearchPhaseExecutionException;
+import org.opensearch.action.search.SearchRequest;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.action.search.SearchResponse;
+import org.opensearch.action.search.SearchScrollRequest;
+import org.opensearch.action.search.SearchScrollRequestBuilder;
+import org.opensearch.action.support.WriteRequest.RefreshPolicy;
+import org.opensearch.action.support.master.AcknowledgedResponse;
+import org.opensearch.action.termvectors.MultiTermVectorsRequest;
+import org.opensearch.action.termvectors.MultiTermVectorsRequestBuilder;
+import org.opensearch.action.termvectors.MultiTermVectorsResponse;
+import org.opensearch.action.termvectors.TermVectorsRequest;
+import org.opensearch.action.termvectors.TermVectorsRequestBuilder;
+import org.opensearch.action.termvectors.TermVectorsResponse;
+import org.opensearch.action.update.UpdateRequest;
+import org.opensearch.action.update.UpdateRequestBuilder;
+import org.opensearch.action.update.UpdateResponse;
+import org.opensearch.client.AdminClient;
+import org.opensearch.client.Client;
+import org.opensearch.cluster.metadata.MappingMetadata;
+import org.opensearch.common.collect.ImmutableOpenMap;
+import org.opensearch.common.document.DocumentField;
+import org.opensearch.common.settings.Settings;
+import org.opensearch.common.settings.Settings.Builder;
+import org.opensearch.common.unit.TimeValue;
+import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.index.query.InnerHitBuilder;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.rest.RestStatus;
+import org.opensearch.search.SearchHit;
+import org.opensearch.search.SearchHits;
+import org.opensearch.search.aggregations.AggregationBuilders;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.collapse.CollapseBuilder;
+import org.opensearch.search.fetch.subphase.highlight.HighlightBuilder;
+import org.opensearch.threadpool.ThreadPool;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -175,7 +175,7 @@ public class SearchEngineClient implements Client {
 
     private static final String CONFIG_INDEX_PREFIX = "fess_config";
 
-    protected FesenRunner runner;
+    protected OpenSearchRunner runner;
 
     protected Client client;
 
@@ -220,7 +220,7 @@ public class SearchEngineClient implements Client {
                 .name();
     }
 
-    public void setRunner(final FesenRunner runner) {
+    public void setRunner(final OpenSearchRunner runner) {
         this.runner = runner;
     }
 
@@ -251,7 +251,7 @@ public class SearchEngineClient implements Client {
                 httpAddress = org.codelibs.fess.util.ResourceUtil.getFesenHttpUrl();
                 break;
             default:
-                runner = new FesenRunner();
+                runner = new OpenSearchRunner();
                 final Configs config = newConfigs().clusterName(clusterName).numOfNode(1).useLogger();
                 final String esDir = System.getProperty("fess.es.dir");
                 if (esDir != null) {
@@ -648,8 +648,8 @@ public class SearchEngineClient implements Client {
             } catch (final Exception e) {
                 cause = e;
             }
-            if (cause instanceof FesenStatusException) {
-                final RestStatus status = ((FesenStatusException) cause).status();
+            if (cause instanceof OpenSearchStatusException) {
+                final RestStatus status = ((OpenSearchStatusException) cause).status();
                 switch (status) {
                 case UNAUTHORIZED:
                     logger.warn("[{}] Unauthorized access: {}", i, System.getProperty(Constants.FESS_ES_HTTP_ADDRESS), cause);
@@ -708,7 +708,7 @@ public class SearchEngineClient implements Client {
         }
         try {
             client.close();
-        } catch (final FesenException e) {
+        } catch (final OpenSearchException e) {
             logger.warn("Failed to close Client: {}", client, e);
         }
     }
@@ -971,7 +971,7 @@ public class SearchEngineClient implements Client {
             final Result result = client.prepareUpdate().setIndex(index).setId(id).setDoc(field, value).execute()
                     .actionGet(ComponentUtil.getFessConfig().getIndexIndexTimeout()).getResult();
             return result == Result.CREATED || result == Result.UPDATED;
-        } catch (final FesenException e) {
+        } catch (final OpenSearchException e) {
             throw new SearchEngineClientException("Failed to set " + value + " to " + field + " for doc " + id, e);
         }
     }
@@ -1016,7 +1016,7 @@ public class SearchEngineClient implements Client {
             final ClusterHealthResponse response =
                     client.admin().cluster().prepareHealth().execute().actionGet(ComponentUtil.getFessConfig().getIndexHealthTimeout());
             return new PingResponse(response);
-        } catch (final FesenException e) {
+        } catch (final OpenSearchException e) {
             throw new SearchEngineClientException("Failed to process a ping request.", e);
         }
     }
@@ -1331,7 +1331,7 @@ public class SearchEngineClient implements Client {
             }
             final Result result = response.getResult();
             return result == Result.CREATED || result == Result.UPDATED;
-        } catch (final FesenException e) {
+        } catch (final OpenSearchException e) {
             throw new SearchEngineClientException("Failed to store: " + obj, e);
         }
     }
@@ -1351,7 +1351,7 @@ public class SearchEngineClient implements Client {
             }
             final DeleteResponse response = builder.execute().actionGet(ComponentUtil.getFessConfig().getIndexDeleteTimeout());
             return response.getResult() == Result.DELETED;
-        } catch (final FesenException e) {
+        } catch (final OpenSearchException e) {
             throw new SearchEngineClientException("Failed to delete: " + index + "/" + id + "@" + seqNo + ":" + primaryTerm, e);
         }
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java
index bac8b999894a57386c136349c2276207ddada565..b7b6c4741b28ea0875cbc5dbd0914d8ba6f9d3ff 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java
+++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java
@@ -27,23 +27,6 @@ import java.util.function.Function;
 
 import javax.annotation.Resource;
 
-import org.codelibs.fesen.action.ActionListener;
-import org.codelibs.fesen.action.DocWriteResponse.Result;
-import org.codelibs.fesen.action.admin.indices.refresh.RefreshResponse;
-import org.codelibs.fesen.action.bulk.BulkItemResponse;
-import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
-import org.codelibs.fesen.action.bulk.BulkResponse;
-import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
-import org.codelibs.fesen.action.delete.DeleteResponse;
-import org.codelibs.fesen.action.index.IndexRequestBuilder;
-import org.codelibs.fesen.action.index.IndexResponse;
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.action.search.SearchResponse;
-import org.codelibs.fesen.action.update.UpdateRequestBuilder;
-import org.codelibs.fesen.client.Client;
-import org.codelibs.fesen.index.seqno.SequenceNumbers;
-import org.codelibs.fesen.search.SearchHit;
-import org.codelibs.fesen.search.SearchHits;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.DocMeta;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.dbflute.Entity;
@@ -58,6 +41,23 @@ import org.dbflute.cbean.result.ListResultBean;
 import org.dbflute.exception.FetchingOverSafetySizeException;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.ActionListener;
+import org.opensearch.action.DocWriteResponse.Result;
+import org.opensearch.action.admin.indices.refresh.RefreshResponse;
+import org.opensearch.action.bulk.BulkItemResponse;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.bulk.BulkResponse;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.delete.DeleteResponse;
+import org.opensearch.action.index.IndexRequestBuilder;
+import org.opensearch.action.index.IndexResponse;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.action.search.SearchResponse;
+import org.opensearch.action.update.UpdateRequestBuilder;
+import org.opensearch.client.Client;
+import org.opensearch.index.seqno.SequenceNumbers;
+import org.opensearch.search.SearchHit;
+import org.opensearch.search.SearchHits;
 
 /**
  * @param <ENTITY> The type of entity.
@@ -89,7 +89,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
     protected abstract <RESULT extends ENTITY> RESULT createEntity(Map<String, Object> source, Class<? extends RESULT> entityType);
 
     // ===================================================================================
-    //                                                                       Fesen
+    //                                                                       OpenSearch
     //                                                                              ======
     public RefreshResponse refresh() {
         return client.admin().indices().prepareRefresh(asEsIndex()).execute().actionGet(refreshTimeout);
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionAggregation.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionAggregation.java
index 5b7cf13d00fbf1cf99610f4208e88a43611acd8f..94e7f8187d7c734e544c83e1a4613c262bd5687d 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionAggregation.java
+++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionAggregation.java
@@ -20,33 +20,33 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-import org.codelibs.fesen.index.query.QueryBuilder;
-import org.codelibs.fesen.search.aggregations.AbstractAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.AggregationBuilders;
-import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.DateRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.dbflute.exception.InvalidQueryRegisteredException;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.search.aggregations.AbstractAggregationBuilder;
+import org.opensearch.search.aggregations.AggregationBuilders;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.DateRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionBean.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionBean.java
index 69ea3af14a398236a01692494c63e70179b0634c..257b43e228465e61c77a4c72577feea8ad797f38 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionBean.java
+++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionBean.java
@@ -15,8 +15,6 @@
  */
 package org.codelibs.fess.es.config.allcommon;
 
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.core.TimeValue;
 import org.dbflute.cbean.ConditionBean;
 import org.dbflute.cbean.chelper.HpCBPurpose;
 import org.dbflute.cbean.chelper.HpColumnSpHandler;
@@ -39,6 +37,8 @@ import org.dbflute.dbmeta.accessory.DerivedTypeHandler;
 import org.dbflute.jdbc.StatementConfig;
 import org.dbflute.system.DBFluteSystem;
 import org.dbflute.twowaysql.style.BoundDateDisplayStyle;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.common.unit.TimeValue;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java
index 475eb0c70fe148b60520ce477a179b5c93104ccf..c005414968f555eb6c501af8f85e8c203f4edc08 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java
+++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java
@@ -26,32 +26,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.TimeZone;
 
-import org.codelibs.fesen.common.unit.Fuzziness;
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
-import org.codelibs.fesen.index.query.ExistsQueryBuilder;
-import org.codelibs.fesen.index.query.IdsQueryBuilder;
-import org.codelibs.fesen.index.query.MatchAllQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
-import org.codelibs.fesen.index.query.MatchQueryBuilder;
-import org.codelibs.fesen.index.query.MoreLikeThisQueryBuilder;
-import org.codelibs.fesen.index.query.PrefixQueryBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
-import org.codelibs.fesen.index.query.QueryBuilders;
-import org.codelibs.fesen.index.query.QueryStringQueryBuilder;
-import org.codelibs.fesen.index.query.RangeQueryBuilder;
-import org.codelibs.fesen.index.query.RegexpQueryBuilder;
-import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
-import org.codelibs.fesen.index.query.TermQueryBuilder;
-import org.codelibs.fesen.index.query.TermsQueryBuilder;
-import org.codelibs.fesen.index.query.WildcardQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
-import org.codelibs.fesen.index.query.functionscore.ScoreFunctionBuilder;
-import org.codelibs.fesen.search.sort.FieldSortBuilder;
-import org.codelibs.fesen.search.sort.SortBuilders;
-import org.codelibs.fesen.search.sort.SortOrder;
 import org.dbflute.cbean.ConditionBean;
 import org.dbflute.cbean.ConditionQuery;
 import org.dbflute.cbean.ckey.ConditionKey;
@@ -64,6 +38,32 @@ import org.dbflute.dbmeta.name.ColumnRealName;
 import org.dbflute.dbmeta.name.ColumnSqlName;
 import org.dbflute.exception.InvalidQueryRegisteredException;
 import org.dbflute.util.Srl;
+import org.opensearch.common.unit.Fuzziness;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchAllQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.MoreLikeThisQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.index.query.QueryStringQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
+import org.opensearch.index.query.functionscore.ScoreFunctionBuilder;
+import org.opensearch.search.sort.FieldSortBuilder;
+import org.opensearch.search.sort.SortBuilders;
+import org.opensearch.search.sort.SortOrder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractEntity.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractEntity.java
index e51f5023326e2a48327dd343fdac41c47f113574..5c78e18d5fa6b47808b8d11920af84b7f197f203 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractEntity.java
+++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractEntity.java
@@ -19,13 +19,13 @@ import java.io.Serializable;
 import java.util.Map;
 import java.util.Set;
 
-import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
-import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.dbflute.Entity;
 import org.dbflute.FunCustodial;
 import org.dbflute.dbmeta.accessory.EntityModifiedProperties;
 import org.dbflute.dbmeta.accessory.EntityUniqueDrivenProperties;
 import org.dbflute.util.DfCollectionUtil;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsPagingResultBean.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsPagingResultBean.java
index f39ac422d001c6390f81c7a44160f39a4259d004..e600362d52836710dd56bd4a7f59edf29fd2571c 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsPagingResultBean.java
+++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsPagingResultBean.java
@@ -16,9 +16,9 @@
 package org.codelibs.fess.es.config.allcommon;
 
 import org.apache.lucene.search.TotalHits;
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.search.aggregations.Aggregations;
 import org.dbflute.cbean.result.PagingResultBean;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.search.aggregations.Aggregations;
 
 /**
  * @param <ENTITY> The type of entity.
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsAccessTokenBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsAccessTokenBhv.java
index e792ed25f9ea750be9aae8485aa506f2869dd5d7..e3ea7a89846f2567b1fac53c8fdfda6511ef31ef 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsAccessTokenBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsAccessTokenBhv.java
@@ -18,9 +18,6 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
-import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
-import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.AccessTokenDbm;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBadWordBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBadWordBhv.java
index 870cb15c43c0fb3b33d8a24d9469c596f5efce04..f7a6ba625ef35754905d97449e368988a95dbb1c 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBadWordBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBadWordBhv.java
@@ -18,9 +18,6 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
-import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
-import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.BadWordDbm;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java
index 308b802cb67ca1248b3f6c008a9f6b61bb16205e..b9b32c841ce4dc0c4709493072aa6d5092df4f8a 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java
@@ -18,9 +18,6 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
-import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
-import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.BoostDocumentRuleDbm;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoBhv.java
index a7b014af3f4e32b508d42074568c10763dd08cdc..53a350cc053aeabb01ee47e52496c0c167781c72 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoBhv.java
@@ -18,9 +18,6 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
-import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
-import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.CrawlingInfoDbm;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoParamBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoParamBhv.java
index 6719c88ce964a9bf0afed2ab8253c9e44b59ecc4..7a2f237aea68cf395471f417d3a38fa5685d70ee 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoParamBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoParamBhv.java
@@ -18,9 +18,6 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
-import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
-import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.CrawlingInfoParamDbm;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java
index 359085ba86493c88e7829d5f0069dc82bfd73bab..f243680bf81f1bf67546d843557d24be4d599a7b 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java
@@ -18,9 +18,6 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
-import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
-import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.DataConfigDbm;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDuplicateHostBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDuplicateHostBhv.java
index 8e450bf06e59379c18ce37de61a71f96757f197d..5766263615d850bc6c7356367648b6c13dc46370 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDuplicateHostBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDuplicateHostBhv.java
@@ -18,9 +18,6 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
-import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
-import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.DuplicateHostDbm;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordBhv.java
index 44566968cd75a5db1cb8cd5907536bfacb90f3c6..ae4e99cd58e88cde093c3bb12def1526c05d9ce5 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordBhv.java
@@ -18,9 +18,6 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
-import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
-import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.ElevateWordDbm;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordToLabelBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordToLabelBhv.java
index 48a7b54560b58cb6eadb33620d35711988650ccb..12cdafa855bd3745024fc30e85dd616c12aed3da 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordToLabelBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordToLabelBhv.java
@@ -18,9 +18,6 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
-import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
-import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.ElevateWordToLabelDbm;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFailureUrlBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFailureUrlBhv.java
index a31e0cf4bd83c4d506be668a65938336606efd41..3e03d5cf0f38e29774935b9f61af9c6b579fc1cd 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFailureUrlBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFailureUrlBhv.java
@@ -18,9 +18,6 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
-import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
-import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.FailureUrlDbm;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileAuthenticationBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileAuthenticationBhv.java
index 35902dc7a33ccff80e4f2121e6c67f391630bd21..c9f86d69cddc1e5b85f5e5215873cf09c133d223 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileAuthenticationBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileAuthenticationBhv.java
@@ -18,9 +18,6 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
-import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
-import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.FileAuthenticationDbm;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigBhv.java
index 5ce10408334f2b72c874dd78bd4683e28598aeb5..686facf24b843c89c4d7f52a1ea8a387b2e6a99c 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigBhv.java
@@ -18,9 +18,6 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
-import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
-import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.FileConfigDbm;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsJobLogBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsJobLogBhv.java
index bc29c791202b2910fd8030ba6f4dcde2bfe7faa9..7b72d6b0215a0731b2f4489bb41fa4ed400535b2 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsJobLogBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsJobLogBhv.java
@@ -18,9 +18,6 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
-import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
-import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.JobLogDbm;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java
index fdafc339fa4a6eca1173974eafd9edf5bb9a6c73..d3301cd1d931c6e4792c0cd6347cc92e29e7721d 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java
@@ -18,9 +18,6 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
-import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
-import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.KeyMatchDbm;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelTypeBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelTypeBhv.java
index e06fcf5ed6ca6e05bfb7341121cbf415e7355446..a94c464845fd241ea446dd91782873082e1af01b 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelTypeBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelTypeBhv.java
@@ -18,9 +18,6 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
-import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
-import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.LabelTypeDbm;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsPathMappingBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsPathMappingBhv.java
index cb6338aa8bead4784693abacf9284105294e081e..ef9ece2251b2cd8a63a3dc3f354e180217fae336 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsPathMappingBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsPathMappingBhv.java
@@ -18,9 +18,6 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
-import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
-import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.PathMappingDbm;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedContentBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedContentBhv.java
index 39c4e094279bae980d7d7ecc858abda5e7c8130d..50606b484f97ab0e02c190641fda8def8fca132b 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedContentBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedContentBhv.java
@@ -18,9 +18,6 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
-import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
-import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.RelatedContentDbm;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedQueryBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedQueryBhv.java
index 75f69cf682adf93a8995c8a204b8b8399f2c6fa7..c05348ff8ae755835807f0470e4f4117d757f0d4 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedQueryBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedQueryBhv.java
@@ -18,9 +18,6 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
-import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
-import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.RelatedQueryDbm;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRequestHeaderBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRequestHeaderBhv.java
index 514d8e166a8805d07f292328313ab1ba5d791c7a..efe375870565f1c4ec443b12925c774f23e9622c 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRequestHeaderBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRequestHeaderBhv.java
@@ -18,9 +18,6 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
-import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
-import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.RequestHeaderDbm;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRoleTypeBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRoleTypeBhv.java
index 9e6aacb551fe0051c059b647ba4b78d7e9210c58..33a404f6aac914b8f2e3d85d26c66c035aa72025 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRoleTypeBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRoleTypeBhv.java
@@ -18,9 +18,6 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
-import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
-import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.RoleTypeDbm;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsScheduledJobBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsScheduledJobBhv.java
index 2e8b635a4c6feacaf2b54046f18ee3421d7c9d62..60b0f05397a4e52b1f171b1ea327aaf062725521 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsScheduledJobBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsScheduledJobBhv.java
@@ -18,9 +18,6 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
-import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
-import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.ScheduledJobDbm;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsThumbnailQueueBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsThumbnailQueueBhv.java
index 763f13e2111aba4fbb0de5e0163cdee9aed66b68..632f4a6604410fc8e90f92a9862d785a271d6307 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsThumbnailQueueBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsThumbnailQueueBhv.java
@@ -18,9 +18,6 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
-import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
-import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.ThumbnailQueueDbm;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebAuthenticationBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebAuthenticationBhv.java
index e0b3b24cd6d0aec58acbb20c6b088b884362b6a5..ddbc36d01b2f3eee6456d2ee8fff019c7a9c399a 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebAuthenticationBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebAuthenticationBhv.java
@@ -18,9 +18,6 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
-import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
-import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.WebAuthenticationDbm;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigBhv.java
index c95afa505f6e9dd06bbf47a27b77f4462047da17..1e0cd858a712f5339735a3b4b8d245cc9eff9a81 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigBhv.java
@@ -18,9 +18,6 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
-import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
-import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.WebConfigDbm;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsAccessTokenCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsAccessTokenCB.java
index fb23cb89933fc5ffc69228621d994a9c8dbfe4ff..440144bca8c90029e6c18b98c2003ebd827d363e 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsAccessTokenCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsAccessTokenCB.java
@@ -19,8 +19,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.AccessTokenDbm;
 import org.codelibs.fess.es.config.cbean.AccessTokenCB;
@@ -29,6 +27,8 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsAccessTokenCA;
 import org.codelibs.fess.es.config.cbean.cq.AccessTokenCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsAccessTokenCQ;
 import org.dbflute.cbean.ConditionQuery;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBadWordCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBadWordCB.java
index d0da9231acde9278ab5ea2a5fa7ac33883f54e97..3414193204f43b9ca679afd73e528c25e53f8699 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBadWordCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBadWordCB.java
@@ -19,8 +19,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.BadWordDbm;
 import org.codelibs.fess.es.config.cbean.BadWordCB;
@@ -29,6 +27,8 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsBadWordCA;
 import org.codelibs.fess.es.config.cbean.cq.BadWordCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsBadWordCQ;
 import org.dbflute.cbean.ConditionQuery;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java
index f1c3ee0c4a29bd9344e2b237232a684290fee375..912be0bddd4436998e70766c90cecf60d8c0e492 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java
@@ -19,8 +19,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.BoostDocumentRuleDbm;
 import org.codelibs.fess.es.config.cbean.BoostDocumentRuleCB;
@@ -29,6 +27,8 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsBoostDocumentRuleCA;
 import org.codelibs.fess.es.config.cbean.cq.BoostDocumentRuleCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsBoostDocumentRuleCQ;
 import org.dbflute.cbean.ConditionQuery;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoCB.java
index 441950bcc13ea46101ea877a4ef69aa2045bfd58..ebfd82c3f4d937b3dafe8d243b327a65ff9bfc19 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoCB.java
@@ -19,8 +19,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.CrawlingInfoDbm;
 import org.codelibs.fess.es.config.cbean.CrawlingInfoCB;
@@ -29,6 +27,8 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsCrawlingInfoCA;
 import org.codelibs.fess.es.config.cbean.cq.CrawlingInfoCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsCrawlingInfoCQ;
 import org.dbflute.cbean.ConditionQuery;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoParamCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoParamCB.java
index 8454ed2e2892e2d37fc95af280f2f8795743729d..ef79f3697fce9749bd13dd0ab9d6755ad30cb7a5 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoParamCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoParamCB.java
@@ -19,8 +19,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.CrawlingInfoParamDbm;
 import org.codelibs.fess.es.config.cbean.CrawlingInfoParamCB;
@@ -29,6 +27,8 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsCrawlingInfoParamCA;
 import org.codelibs.fess.es.config.cbean.cq.CrawlingInfoParamCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsCrawlingInfoParamCQ;
 import org.dbflute.cbean.ConditionQuery;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java
index 69a2b61f736ba8855ab0a1987b6cb4af9448cc5b..c5dd18f81212e78d378e61ec5846044657620580 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java
@@ -19,8 +19,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.DataConfigDbm;
 import org.codelibs.fess.es.config.cbean.DataConfigCB;
@@ -29,6 +27,8 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsDataConfigCA;
 import org.codelibs.fess.es.config.cbean.cq.DataConfigCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsDataConfigCQ;
 import org.dbflute.cbean.ConditionQuery;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDuplicateHostCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDuplicateHostCB.java
index 049ce240d7271d3af446353beb14de56c18bd61f..a5c8ffb281b0b0f3518b5e46187565af40661d9e 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDuplicateHostCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDuplicateHostCB.java
@@ -19,8 +19,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.DuplicateHostDbm;
 import org.codelibs.fess.es.config.cbean.DuplicateHostCB;
@@ -29,6 +27,8 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsDuplicateHostCA;
 import org.codelibs.fess.es.config.cbean.cq.DuplicateHostCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsDuplicateHostCQ;
 import org.dbflute.cbean.ConditionQuery;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordCB.java
index 24a800a663dce8322a67d96cb737335750dd846e..01458250ff30fef5a98a0e9a4bd2dd7148739224 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordCB.java
@@ -19,8 +19,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.ElevateWordDbm;
 import org.codelibs.fess.es.config.cbean.ElevateWordCB;
@@ -29,6 +27,8 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsElevateWordCA;
 import org.codelibs.fess.es.config.cbean.cq.ElevateWordCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsElevateWordCQ;
 import org.dbflute.cbean.ConditionQuery;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordToLabelCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordToLabelCB.java
index 381c4c820ef2c75bce22807eda6c725881b4433d..ae91373cbf511afe94e2049aa3347fc306a9eabf 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordToLabelCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordToLabelCB.java
@@ -19,8 +19,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.ElevateWordToLabelDbm;
 import org.codelibs.fess.es.config.cbean.ElevateWordToLabelCB;
@@ -29,6 +27,8 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsElevateWordToLabelCA;
 import org.codelibs.fess.es.config.cbean.cq.ElevateWordToLabelCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsElevateWordToLabelCQ;
 import org.dbflute.cbean.ConditionQuery;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java
index 3cbc2607eb43cc0367ea9af7e48c2ffa53761b1e..7c1a84d1ad2d2dd2a42e010211f0cfc8d3c7af7b 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java
@@ -19,8 +19,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.FailureUrlDbm;
 import org.codelibs.fess.es.config.cbean.FailureUrlCB;
@@ -29,6 +27,8 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsFailureUrlCA;
 import org.codelibs.fess.es.config.cbean.cq.FailureUrlCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsFailureUrlCQ;
 import org.dbflute.cbean.ConditionQuery;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java
index 05e646ef10c0c98c3e4fc71f1397a4328f21b70d..6cb4856978bdc9a3f1be411e6e4b03b5b9929cec 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java
@@ -19,8 +19,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.FileAuthenticationDbm;
 import org.codelibs.fess.es.config.cbean.FileAuthenticationCB;
@@ -29,6 +27,8 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsFileAuthenticationCA;
 import org.codelibs.fess.es.config.cbean.cq.FileAuthenticationCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsFileAuthenticationCQ;
 import org.dbflute.cbean.ConditionQuery;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java
index ebb85054c80e6102a113b1248ee3645ff2d591f8..1c138c0fe4e7626edfcd0a6368c22a0679ecc56e 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java
@@ -19,8 +19,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.FileConfigDbm;
 import org.codelibs.fess.es.config.cbean.FileConfigCB;
@@ -29,6 +27,8 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsFileConfigCA;
 import org.codelibs.fess.es.config.cbean.cq.FileConfigCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsFileConfigCQ;
 import org.dbflute.cbean.ConditionQuery;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java
index 98456d4e3a177b63ed1dc9f1064fb7699bd690c6..51c8fe9e24719ebb376c6c660ecb6cc6ebd5a682 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java
@@ -19,8 +19,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.JobLogDbm;
 import org.codelibs.fess.es.config.cbean.JobLogCB;
@@ -29,6 +27,8 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsJobLogCA;
 import org.codelibs.fess.es.config.cbean.cq.JobLogCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsJobLogCQ;
 import org.dbflute.cbean.ConditionQuery;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java
index 8f8dba622016016dee1ea015d8f67dd772e5db6d..1714cae99ff9dabaa1e3e8f1e4447a77ec63a47d 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java
@@ -19,8 +19,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.KeyMatchDbm;
 import org.codelibs.fess.es.config.cbean.KeyMatchCB;
@@ -29,6 +27,8 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsKeyMatchCA;
 import org.codelibs.fess.es.config.cbean.cq.KeyMatchCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsKeyMatchCQ;
 import org.dbflute.cbean.ConditionQuery;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java
index f6ad885733cf0e9c14256bcc14ef753bc6e93308..448dbe1a4269b8b2c4b7b00a324fd1067e1723c1 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java
@@ -19,8 +19,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.LabelTypeDbm;
 import org.codelibs.fess.es.config.cbean.LabelTypeCB;
@@ -29,6 +27,8 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsLabelTypeCA;
 import org.codelibs.fess.es.config.cbean.cq.LabelTypeCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsLabelTypeCQ;
 import org.dbflute.cbean.ConditionQuery;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java
index b6f01c4874950c0cf4d7e9c934bd1474aff091c6..7dca53dfc27e9cd1a9f8079f8265cee63ca68df9 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java
@@ -19,8 +19,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.PathMappingDbm;
 import org.codelibs.fess.es.config.cbean.PathMappingCB;
@@ -29,6 +27,8 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsPathMappingCA;
 import org.codelibs.fess.es.config.cbean.cq.PathMappingCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsPathMappingCQ;
 import org.dbflute.cbean.ConditionQuery;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedContentCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedContentCB.java
index c818ed9cd328685c4f4fc8e5d0fd313dd1825507..4d59e86a00d455b53597c96ee818407f0ca59744 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedContentCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedContentCB.java
@@ -19,8 +19,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.RelatedContentDbm;
 import org.codelibs.fess.es.config.cbean.RelatedContentCB;
@@ -29,6 +27,8 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsRelatedContentCA;
 import org.codelibs.fess.es.config.cbean.cq.RelatedContentCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsRelatedContentCQ;
 import org.dbflute.cbean.ConditionQuery;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedQueryCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedQueryCB.java
index a1b2a2af0324d523bae43c8c73d66cc6c6d8cfe4..f5c963659dfe38eed363d7f441852f7955b45abe 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedQueryCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedQueryCB.java
@@ -19,8 +19,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.RelatedQueryDbm;
 import org.codelibs.fess.es.config.cbean.RelatedQueryCB;
@@ -29,6 +27,8 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsRelatedQueryCA;
 import org.codelibs.fess.es.config.cbean.cq.RelatedQueryCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsRelatedQueryCQ;
 import org.dbflute.cbean.ConditionQuery;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRequestHeaderCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRequestHeaderCB.java
index 77de3eb3c5aa2a6f249a82b9622a0bc5a6882b7c..60b73f68cc036c17bb66a9b4cf5ffd49158c004a 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRequestHeaderCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRequestHeaderCB.java
@@ -19,8 +19,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.RequestHeaderDbm;
 import org.codelibs.fess.es.config.cbean.RequestHeaderCB;
@@ -29,6 +27,8 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsRequestHeaderCA;
 import org.codelibs.fess.es.config.cbean.cq.RequestHeaderCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsRequestHeaderCQ;
 import org.dbflute.cbean.ConditionQuery;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRoleTypeCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRoleTypeCB.java
index 18cd1c895ceb78fdb88f1d72397b634486d198dd..7fc02cf860a6471684dd3db9b0cacf95f4e48747 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRoleTypeCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRoleTypeCB.java
@@ -19,8 +19,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.RoleTypeDbm;
 import org.codelibs.fess.es.config.cbean.RoleTypeCB;
@@ -29,6 +27,8 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsRoleTypeCA;
 import org.codelibs.fess.es.config.cbean.cq.RoleTypeCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsRoleTypeCQ;
 import org.dbflute.cbean.ConditionQuery;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsScheduledJobCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsScheduledJobCB.java
index 830bedba563b28ebff51e04bb64b600a64e6d1c9..b4e29266f080717144a6626215d772444ae35403 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsScheduledJobCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsScheduledJobCB.java
@@ -19,8 +19,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.ScheduledJobDbm;
 import org.codelibs.fess.es.config.cbean.ScheduledJobCB;
@@ -29,6 +27,8 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsScheduledJobCA;
 import org.codelibs.fess.es.config.cbean.cq.ScheduledJobCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsScheduledJobCQ;
 import org.dbflute.cbean.ConditionQuery;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsThumbnailQueueCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsThumbnailQueueCB.java
index f10904eec021b254d66f660a615d0ee555f1a1a5..e172eaab08fb3e37934068c0d7344e61bad49602 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsThumbnailQueueCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsThumbnailQueueCB.java
@@ -19,8 +19,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.ThumbnailQueueDbm;
 import org.codelibs.fess.es.config.cbean.ThumbnailQueueCB;
@@ -29,6 +27,8 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsThumbnailQueueCA;
 import org.codelibs.fess.es.config.cbean.cq.ThumbnailQueueCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsThumbnailQueueCQ;
 import org.dbflute.cbean.ConditionQuery;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebAuthenticationCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebAuthenticationCB.java
index 508e5eed36ecb1757a06f2db508d623ac5ffc131..5e0d91c706cf1cf6ccd9316e57d43707d500946e 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebAuthenticationCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebAuthenticationCB.java
@@ -19,8 +19,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.WebAuthenticationDbm;
 import org.codelibs.fess.es.config.cbean.WebAuthenticationCB;
@@ -29,6 +27,8 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsWebAuthenticationCA;
 import org.codelibs.fess.es.config.cbean.cq.WebAuthenticationCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsWebAuthenticationCQ;
 import org.dbflute.cbean.ConditionQuery;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java
index 636db118cceca962cff7974d354415e7efa0d499..a6b97fdc369b6e9e9a74e8db8ec233277580b5d4 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java
@@ -19,8 +19,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.WebConfigDbm;
 import org.codelibs.fess.es.config.cbean.WebConfigCB;
@@ -29,6 +27,8 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsWebConfigCA;
 import org.codelibs.fess.es.config.cbean.cq.WebConfigCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsWebConfigCQ;
 import org.dbflute.cbean.ConditionQuery;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsAccessTokenCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsAccessTokenCA.java
index a0256c3f15ea8b8e4e43161b4cbca9df6d03cd4e..04f8a2c11339fc1e8258410bb933b7d636d714ea 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsAccessTokenCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsAccessTokenCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
-import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.AccessTokenCA;
 import org.codelibs.fess.es.config.cbean.cq.AccessTokenCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsAccessTokenCQ;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBadWordCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBadWordCA.java
index bbd703a383cfccec67e6b752c440feceed07c522..452182ef73574deef35f1623e8fa92734552dfb4 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBadWordCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBadWordCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
-import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.BadWordCA;
 import org.codelibs.fess.es.config.cbean.cq.BadWordCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsBadWordCQ;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBoostDocumentRuleCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBoostDocumentRuleCA.java
index bf25b63c3b78d8c2f712e9b759dd9233d904ab79..7367122ac46988d5a674e9a3cfa022b1cf7dca13 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBoostDocumentRuleCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBoostDocumentRuleCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
-import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.BoostDocumentRuleCA;
 import org.codelibs.fess.es.config.cbean.cq.BoostDocumentRuleCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsBoostDocumentRuleCQ;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoCA.java
index c74afe9679ebceed70354a224d5f260a89846d30..c5bc611fc6195a12f37bf8cdd1b5b2f09acbb93f 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
-import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.CrawlingInfoCA;
 import org.codelibs.fess.es.config.cbean.cq.CrawlingInfoCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsCrawlingInfoCQ;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoParamCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoParamCA.java
index 1a9de88614335493004233b89b896e5864536d59..2f9b050b0e254695eafa197d69b78750b77b966d 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoParamCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoParamCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
-import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.CrawlingInfoParamCA;
 import org.codelibs.fess.es.config.cbean.cq.CrawlingInfoParamCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsCrawlingInfoParamCQ;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigCA.java
index 361441b75d18692b58fe5fa99b05804f7c409548..cff30d739a0b0fc5148e0b071d062ffa65e87101 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
-import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.DataConfigCA;
 import org.codelibs.fess.es.config.cbean.cq.DataConfigCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsDataConfigCQ;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDuplicateHostCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDuplicateHostCA.java
index 2d8988bf6a33fd3259ca55f4cfbcc4f8997a3e1b..56664d257dadfc3c5a0e7cbd8a9263a6a75764c1 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDuplicateHostCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDuplicateHostCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
-import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.DuplicateHostCA;
 import org.codelibs.fess.es.config.cbean.cq.DuplicateHostCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsDuplicateHostCQ;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordCA.java
index c3a0c4682a49aa06815b67716921697b3ee220f3..e6e179ffccee076d6c6243136b1a365dd783719a 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
-import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.ElevateWordCA;
 import org.codelibs.fess.es.config.cbean.cq.ElevateWordCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsElevateWordCQ;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordToLabelCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordToLabelCA.java
index ddef827d7ffde516d1bf293d4830dc668459427c..3c0017abfdc20f9379b291b5cc999e39d1754bc3 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordToLabelCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordToLabelCA.java
@@ -15,22 +15,22 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
-import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.ElevateWordToLabelCA;
 import org.codelibs.fess.es.config.cbean.cq.ElevateWordToLabelCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsElevateWordToLabelCQ;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFailureUrlCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFailureUrlCA.java
index 0f7cc7f312562cb3843b5a489aed4437559ab717..edc6ed7c3ade088c643cf37c4ba02eaa69c952b9 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFailureUrlCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFailureUrlCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
-import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.FailureUrlCA;
 import org.codelibs.fess.es.config.cbean.cq.FailureUrlCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsFailureUrlCQ;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileAuthenticationCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileAuthenticationCA.java
index dc2d91419d2e1c1438db8c315bf210a79275fa0d..2391c34017aaf52e54fcf5d669633af90e106b95 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileAuthenticationCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileAuthenticationCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
-import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.FileAuthenticationCA;
 import org.codelibs.fess.es.config.cbean.cq.FileAuthenticationCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsFileAuthenticationCQ;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigCA.java
index 17a9acdee52a37ce7dc84cfd505c4a077a6250ed..f49b2d9291e00c5c15177a73290210bc9fc5c062 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
-import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.FileConfigCA;
 import org.codelibs.fess.es.config.cbean.cq.FileConfigCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsFileConfigCQ;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsJobLogCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsJobLogCA.java
index fc9ad211db2121871b2fcc0140c3fa29e67b08e9..dadb50566e00ce31c516019d6120b3e95549b07a 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsJobLogCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsJobLogCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
-import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.JobLogCA;
 import org.codelibs.fess.es.config.cbean.cq.JobLogCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsJobLogCQ;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsKeyMatchCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsKeyMatchCA.java
index 9d4b841681d863400520506b933d5f9ef3139a1e..2dcd056fe1867a6a6ad07f70db38723faf6b70ef 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsKeyMatchCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsKeyMatchCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
-import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.KeyMatchCA;
 import org.codelibs.fess.es.config.cbean.cq.KeyMatchCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsKeyMatchCQ;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsLabelTypeCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsLabelTypeCA.java
index 140350eea460d3f5dca7e7841dff6c4ea9719444..d5eec0be2252a02cd52eff7cada2b70319e98d24 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsLabelTypeCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsLabelTypeCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
-import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.LabelTypeCA;
 import org.codelibs.fess.es.config.cbean.cq.LabelTypeCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsLabelTypeCQ;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsPathMappingCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsPathMappingCA.java
index 58f6547a05f03c20280907791de02d45cd181868..686f8fa31f0a95ac12b7fbea1799c4d7a147776e 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsPathMappingCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsPathMappingCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
-import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.PathMappingCA;
 import org.codelibs.fess.es.config.cbean.cq.PathMappingCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsPathMappingCQ;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedContentCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedContentCA.java
index 420724ef943a243e52e4b1a0289fb0b581efc093..1880cad5cd631b4f7458198566ecdd8a279ea9a1 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedContentCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedContentCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
-import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.RelatedContentCA;
 import org.codelibs.fess.es.config.cbean.cq.RelatedContentCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsRelatedContentCQ;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedQueryCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedQueryCA.java
index e78e3141e795b776b0ca52fb1dfaf2862824d785..f8bb9d9c2e32ca83701d003572245e07ba1e40d6 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedQueryCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedQueryCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
-import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.RelatedQueryCA;
 import org.codelibs.fess.es.config.cbean.cq.RelatedQueryCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsRelatedQueryCQ;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRequestHeaderCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRequestHeaderCA.java
index 025c325d661d16706512ae1287ba95514b32d0d1..76b935582222f7378107f1b1400ded8840354dec 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRequestHeaderCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRequestHeaderCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
-import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.RequestHeaderCA;
 import org.codelibs.fess.es.config.cbean.cq.RequestHeaderCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsRequestHeaderCQ;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRoleTypeCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRoleTypeCA.java
index 1f1b2ce37234ef78c66237ce6ca34e67635aa808..e10022e105ffa5917fe0dff631f29786fe020ef3 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRoleTypeCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRoleTypeCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
-import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.RoleTypeCA;
 import org.codelibs.fess.es.config.cbean.cq.RoleTypeCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsRoleTypeCQ;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsScheduledJobCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsScheduledJobCA.java
index de870bf56c8124fa978a64e446aad25df4df05dc..6236bf1c328dc407e484b18cef11e715524a749d 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsScheduledJobCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsScheduledJobCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
-import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.ScheduledJobCA;
 import org.codelibs.fess.es.config.cbean.cq.ScheduledJobCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsScheduledJobCQ;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsThumbnailQueueCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsThumbnailQueueCA.java
index 1d277761346cf127af5e81e211f7fd7ba88703a5..a436254de2878343e12e8ae47896343c68a89689 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsThumbnailQueueCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsThumbnailQueueCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
-import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.ThumbnailQueueCA;
 import org.codelibs.fess.es.config.cbean.cq.ThumbnailQueueCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsThumbnailQueueCQ;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebAuthenticationCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebAuthenticationCA.java
index 1c635725b362b30c0adfd9fe8d5f30c547e54eec..507e9141075b13d369d0060f6abf088686acd61c 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebAuthenticationCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebAuthenticationCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
-import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.WebAuthenticationCA;
 import org.codelibs.fess.es.config.cbean.cq.WebAuthenticationCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsWebAuthenticationCQ;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigCA.java
index 82573fd08f0e177d8e32081f41dbbf2962c2facb..d403675f57083a32838e7017270df20548c8bfbb 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
-import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.WebConfigCA;
 import org.codelibs.fess.es.config.cbean.cq.WebConfigCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsWebConfigCQ;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsAccessTokenCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsAccessTokenCQ.java
index b1ec27b8436711e91efe17a028a243dd8d97d0f9..4a23b5d550c10d6d95289df9f699fe40421d11a6 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsAccessTokenCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsAccessTokenCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
-import org.codelibs.fesen.index.query.ExistsQueryBuilder;
-import org.codelibs.fesen.index.query.IdsQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
-import org.codelibs.fesen.index.query.MatchQueryBuilder;
-import org.codelibs.fesen.index.query.PrefixQueryBuilder;
-import org.codelibs.fesen.index.query.RangeQueryBuilder;
-import org.codelibs.fesen.index.query.RegexpQueryBuilder;
-import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
-import org.codelibs.fesen.index.query.TermQueryBuilder;
-import org.codelibs.fesen.index.query.TermsQueryBuilder;
-import org.codelibs.fesen.index.query.WildcardQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.AccessTokenCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBadWordCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBadWordCQ.java
index 514a1bd197c9040927aaab6e69cdebd4fac38891..149390455273c249ad3d31748f381cafffd71699 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBadWordCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBadWordCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
-import org.codelibs.fesen.index.query.ExistsQueryBuilder;
-import org.codelibs.fesen.index.query.IdsQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
-import org.codelibs.fesen.index.query.MatchQueryBuilder;
-import org.codelibs.fesen.index.query.PrefixQueryBuilder;
-import org.codelibs.fesen.index.query.RangeQueryBuilder;
-import org.codelibs.fesen.index.query.RegexpQueryBuilder;
-import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
-import org.codelibs.fesen.index.query.TermQueryBuilder;
-import org.codelibs.fesen.index.query.TermsQueryBuilder;
-import org.codelibs.fesen.index.query.WildcardQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.BadWordCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java
index ca35994b957651e8576f9ad1d6d94898ebb46e40..8bad31e722b3877f7aa0c2e9ce9245e7ef1f3f27 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
-import org.codelibs.fesen.index.query.ExistsQueryBuilder;
-import org.codelibs.fesen.index.query.IdsQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
-import org.codelibs.fesen.index.query.MatchQueryBuilder;
-import org.codelibs.fesen.index.query.PrefixQueryBuilder;
-import org.codelibs.fesen.index.query.RangeQueryBuilder;
-import org.codelibs.fesen.index.query.RegexpQueryBuilder;
-import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
-import org.codelibs.fesen.index.query.TermQueryBuilder;
-import org.codelibs.fesen.index.query.TermsQueryBuilder;
-import org.codelibs.fesen.index.query.WildcardQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.BoostDocumentRuleCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoCQ.java
index 86d36447bea9a80b6127de2b8593f20b65a8af9b..06655a3be8c51ebb92e9b8f555002e70c187c27f 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
-import org.codelibs.fesen.index.query.ExistsQueryBuilder;
-import org.codelibs.fesen.index.query.IdsQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
-import org.codelibs.fesen.index.query.MatchQueryBuilder;
-import org.codelibs.fesen.index.query.PrefixQueryBuilder;
-import org.codelibs.fesen.index.query.RangeQueryBuilder;
-import org.codelibs.fesen.index.query.RegexpQueryBuilder;
-import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
-import org.codelibs.fesen.index.query.TermQueryBuilder;
-import org.codelibs.fesen.index.query.TermsQueryBuilder;
-import org.codelibs.fesen.index.query.WildcardQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.CrawlingInfoCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoParamCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoParamCQ.java
index b384d3a78545811ba23ff6651bf68174dfb88fb1..b90da77bca295938894ce508b05f61082f0171e8 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoParamCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoParamCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
-import org.codelibs.fesen.index.query.ExistsQueryBuilder;
-import org.codelibs.fesen.index.query.IdsQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
-import org.codelibs.fesen.index.query.MatchQueryBuilder;
-import org.codelibs.fesen.index.query.PrefixQueryBuilder;
-import org.codelibs.fesen.index.query.RangeQueryBuilder;
-import org.codelibs.fesen.index.query.RegexpQueryBuilder;
-import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
-import org.codelibs.fesen.index.query.TermQueryBuilder;
-import org.codelibs.fesen.index.query.TermsQueryBuilder;
-import org.codelibs.fesen.index.query.WildcardQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.CrawlingInfoParamCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java
index a3d0f8fd4520aa55e6260f3f34c2fc851142b4c7..fc8c4f758462e5b8c2d7b53c594d38783d9c178b 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
-import org.codelibs.fesen.index.query.ExistsQueryBuilder;
-import org.codelibs.fesen.index.query.IdsQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
-import org.codelibs.fesen.index.query.MatchQueryBuilder;
-import org.codelibs.fesen.index.query.PrefixQueryBuilder;
-import org.codelibs.fesen.index.query.RangeQueryBuilder;
-import org.codelibs.fesen.index.query.RegexpQueryBuilder;
-import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
-import org.codelibs.fesen.index.query.TermQueryBuilder;
-import org.codelibs.fesen.index.query.TermsQueryBuilder;
-import org.codelibs.fesen.index.query.WildcardQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.DataConfigCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDuplicateHostCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDuplicateHostCQ.java
index 6d9f8dab936cf072ddb75d461270cf6d4c48b453..62e5234dad7630023a85ded53c68888a26aa386b 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDuplicateHostCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDuplicateHostCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
-import org.codelibs.fesen.index.query.ExistsQueryBuilder;
-import org.codelibs.fesen.index.query.IdsQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
-import org.codelibs.fesen.index.query.MatchQueryBuilder;
-import org.codelibs.fesen.index.query.PrefixQueryBuilder;
-import org.codelibs.fesen.index.query.RangeQueryBuilder;
-import org.codelibs.fesen.index.query.RegexpQueryBuilder;
-import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
-import org.codelibs.fesen.index.query.TermQueryBuilder;
-import org.codelibs.fesen.index.query.TermsQueryBuilder;
-import org.codelibs.fesen.index.query.WildcardQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.DuplicateHostCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordCQ.java
index 85d5f71cb46953bb0c950d52970e5dc9f5249284..b650f7f876a68771f9dda461cb34b0b378463e8b 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
-import org.codelibs.fesen.index.query.ExistsQueryBuilder;
-import org.codelibs.fesen.index.query.IdsQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
-import org.codelibs.fesen.index.query.MatchQueryBuilder;
-import org.codelibs.fesen.index.query.PrefixQueryBuilder;
-import org.codelibs.fesen.index.query.RangeQueryBuilder;
-import org.codelibs.fesen.index.query.RegexpQueryBuilder;
-import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
-import org.codelibs.fesen.index.query.TermQueryBuilder;
-import org.codelibs.fesen.index.query.TermsQueryBuilder;
-import org.codelibs.fesen.index.query.WildcardQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.ElevateWordCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordToLabelCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordToLabelCQ.java
index 12a37864b6fce882961ff5f2f30bab119419f5ed..926c174b68ed12a7fb1653746a76036ceec7bf86 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordToLabelCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordToLabelCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
-import org.codelibs.fesen.index.query.ExistsQueryBuilder;
-import org.codelibs.fesen.index.query.IdsQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
-import org.codelibs.fesen.index.query.MatchQueryBuilder;
-import org.codelibs.fesen.index.query.PrefixQueryBuilder;
-import org.codelibs.fesen.index.query.RangeQueryBuilder;
-import org.codelibs.fesen.index.query.RegexpQueryBuilder;
-import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
-import org.codelibs.fesen.index.query.TermQueryBuilder;
-import org.codelibs.fesen.index.query.TermsQueryBuilder;
-import org.codelibs.fesen.index.query.WildcardQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.ElevateWordToLabelCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java
index f6bbdc02a6d6538c8eaf796b2d33500a61909f8f..d7901756b7632307dac6f30408dff3aa5ede5850 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
-import org.codelibs.fesen.index.query.ExistsQueryBuilder;
-import org.codelibs.fesen.index.query.IdsQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
-import org.codelibs.fesen.index.query.MatchQueryBuilder;
-import org.codelibs.fesen.index.query.PrefixQueryBuilder;
-import org.codelibs.fesen.index.query.RangeQueryBuilder;
-import org.codelibs.fesen.index.query.RegexpQueryBuilder;
-import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
-import org.codelibs.fesen.index.query.TermQueryBuilder;
-import org.codelibs.fesen.index.query.TermsQueryBuilder;
-import org.codelibs.fesen.index.query.WildcardQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.FailureUrlCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java
index da03e1003e096dbaa86345340e29ce7af01602da..973d460b9ca339390b1f40b91bb7757992e0949c 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
-import org.codelibs.fesen.index.query.ExistsQueryBuilder;
-import org.codelibs.fesen.index.query.IdsQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
-import org.codelibs.fesen.index.query.MatchQueryBuilder;
-import org.codelibs.fesen.index.query.PrefixQueryBuilder;
-import org.codelibs.fesen.index.query.RangeQueryBuilder;
-import org.codelibs.fesen.index.query.RegexpQueryBuilder;
-import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
-import org.codelibs.fesen.index.query.TermQueryBuilder;
-import org.codelibs.fesen.index.query.TermsQueryBuilder;
-import org.codelibs.fesen.index.query.WildcardQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.FileAuthenticationCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java
index f11c7ac69a6f9ba296580b9b6a84d77f5ae48185..615fb96cc56c5d84de238084295e84322c9f3924 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
-import org.codelibs.fesen.index.query.ExistsQueryBuilder;
-import org.codelibs.fesen.index.query.IdsQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
-import org.codelibs.fesen.index.query.MatchQueryBuilder;
-import org.codelibs.fesen.index.query.PrefixQueryBuilder;
-import org.codelibs.fesen.index.query.RangeQueryBuilder;
-import org.codelibs.fesen.index.query.RegexpQueryBuilder;
-import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
-import org.codelibs.fesen.index.query.TermQueryBuilder;
-import org.codelibs.fesen.index.query.TermsQueryBuilder;
-import org.codelibs.fesen.index.query.WildcardQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.FileConfigCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java
index aef3e6fad26956d1a6b31b60c53d53f8b4345ad5..a5e08756ab048eab7ceea133ec927301c71f68ea 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
-import org.codelibs.fesen.index.query.ExistsQueryBuilder;
-import org.codelibs.fesen.index.query.IdsQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
-import org.codelibs.fesen.index.query.MatchQueryBuilder;
-import org.codelibs.fesen.index.query.PrefixQueryBuilder;
-import org.codelibs.fesen.index.query.RangeQueryBuilder;
-import org.codelibs.fesen.index.query.RegexpQueryBuilder;
-import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
-import org.codelibs.fesen.index.query.TermQueryBuilder;
-import org.codelibs.fesen.index.query.TermsQueryBuilder;
-import org.codelibs.fesen.index.query.WildcardQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.JobLogCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java
index 5636e8b69fa1cd0979845ee3441f2648ab1513c5..e5796fc78b6b388ce74edd200f618bdf1f50acee 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
-import org.codelibs.fesen.index.query.ExistsQueryBuilder;
-import org.codelibs.fesen.index.query.IdsQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
-import org.codelibs.fesen.index.query.MatchQueryBuilder;
-import org.codelibs.fesen.index.query.PrefixQueryBuilder;
-import org.codelibs.fesen.index.query.RangeQueryBuilder;
-import org.codelibs.fesen.index.query.RegexpQueryBuilder;
-import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
-import org.codelibs.fesen.index.query.TermQueryBuilder;
-import org.codelibs.fesen.index.query.TermsQueryBuilder;
-import org.codelibs.fesen.index.query.WildcardQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.KeyMatchCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java
index 571437ddd74e7f2e2fab7161588ddf7e6e01cdfe..e606527830fa8f3cb909770709d08ed0114379f1 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
-import org.codelibs.fesen.index.query.ExistsQueryBuilder;
-import org.codelibs.fesen.index.query.IdsQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
-import org.codelibs.fesen.index.query.MatchQueryBuilder;
-import org.codelibs.fesen.index.query.PrefixQueryBuilder;
-import org.codelibs.fesen.index.query.RangeQueryBuilder;
-import org.codelibs.fesen.index.query.RegexpQueryBuilder;
-import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
-import org.codelibs.fesen.index.query.TermQueryBuilder;
-import org.codelibs.fesen.index.query.TermsQueryBuilder;
-import org.codelibs.fesen.index.query.WildcardQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.LabelTypeCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java
index ff773cff64ef214f3733a93db3d3288c91c50608..81124e9c0df47cabdc6f9f20c051314f42ffb51d 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
-import org.codelibs.fesen.index.query.ExistsQueryBuilder;
-import org.codelibs.fesen.index.query.IdsQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
-import org.codelibs.fesen.index.query.MatchQueryBuilder;
-import org.codelibs.fesen.index.query.PrefixQueryBuilder;
-import org.codelibs.fesen.index.query.RangeQueryBuilder;
-import org.codelibs.fesen.index.query.RegexpQueryBuilder;
-import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
-import org.codelibs.fesen.index.query.TermQueryBuilder;
-import org.codelibs.fesen.index.query.TermsQueryBuilder;
-import org.codelibs.fesen.index.query.WildcardQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.PathMappingCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedContentCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedContentCQ.java
index 234734ab5111f517434d6d00ab4f2eddd52f22ee..0fd44692757af3a6eed3c8c247149a04f9101d6d 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedContentCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedContentCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
-import org.codelibs.fesen.index.query.ExistsQueryBuilder;
-import org.codelibs.fesen.index.query.IdsQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
-import org.codelibs.fesen.index.query.MatchQueryBuilder;
-import org.codelibs.fesen.index.query.PrefixQueryBuilder;
-import org.codelibs.fesen.index.query.RangeQueryBuilder;
-import org.codelibs.fesen.index.query.RegexpQueryBuilder;
-import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
-import org.codelibs.fesen.index.query.TermQueryBuilder;
-import org.codelibs.fesen.index.query.TermsQueryBuilder;
-import org.codelibs.fesen.index.query.WildcardQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.RelatedContentCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedQueryCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedQueryCQ.java
index 5775a1acc9c017c022d0ea3d0c6a59e38e45b71c..494068d737c209bbdade08eb79ca5ce44d358538 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedQueryCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedQueryCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
-import org.codelibs.fesen.index.query.ExistsQueryBuilder;
-import org.codelibs.fesen.index.query.IdsQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
-import org.codelibs.fesen.index.query.MatchQueryBuilder;
-import org.codelibs.fesen.index.query.PrefixQueryBuilder;
-import org.codelibs.fesen.index.query.RangeQueryBuilder;
-import org.codelibs.fesen.index.query.RegexpQueryBuilder;
-import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
-import org.codelibs.fesen.index.query.TermQueryBuilder;
-import org.codelibs.fesen.index.query.TermsQueryBuilder;
-import org.codelibs.fesen.index.query.WildcardQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.RelatedQueryCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java
index 959897d499253d85bb187beddfce5a60849d0ee7..73fa54f6c622dedf841806b619b34be994cb1fd0 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
-import org.codelibs.fesen.index.query.ExistsQueryBuilder;
-import org.codelibs.fesen.index.query.IdsQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
-import org.codelibs.fesen.index.query.MatchQueryBuilder;
-import org.codelibs.fesen.index.query.PrefixQueryBuilder;
-import org.codelibs.fesen.index.query.RangeQueryBuilder;
-import org.codelibs.fesen.index.query.RegexpQueryBuilder;
-import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
-import org.codelibs.fesen.index.query.TermQueryBuilder;
-import org.codelibs.fesen.index.query.TermsQueryBuilder;
-import org.codelibs.fesen.index.query.WildcardQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.RequestHeaderCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java
index d2d8a1e8e6472e91ee3c4b319802947f122eab5f..14b03ee384f3c7fe034f7826f38b4ecae7ff1783 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
-import org.codelibs.fesen.index.query.ExistsQueryBuilder;
-import org.codelibs.fesen.index.query.IdsQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
-import org.codelibs.fesen.index.query.MatchQueryBuilder;
-import org.codelibs.fesen.index.query.PrefixQueryBuilder;
-import org.codelibs.fesen.index.query.RangeQueryBuilder;
-import org.codelibs.fesen.index.query.RegexpQueryBuilder;
-import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
-import org.codelibs.fesen.index.query.TermQueryBuilder;
-import org.codelibs.fesen.index.query.TermsQueryBuilder;
-import org.codelibs.fesen.index.query.WildcardQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.RoleTypeCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java
index 7a6051639aaa0d8f9234a9b21545bfc140899bc0..5ecd8b715f83e0e2fbe7e1b2170cc835ee902733 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
-import org.codelibs.fesen.index.query.ExistsQueryBuilder;
-import org.codelibs.fesen.index.query.IdsQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
-import org.codelibs.fesen.index.query.MatchQueryBuilder;
-import org.codelibs.fesen.index.query.PrefixQueryBuilder;
-import org.codelibs.fesen.index.query.RangeQueryBuilder;
-import org.codelibs.fesen.index.query.RegexpQueryBuilder;
-import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
-import org.codelibs.fesen.index.query.TermQueryBuilder;
-import org.codelibs.fesen.index.query.TermsQueryBuilder;
-import org.codelibs.fesen.index.query.WildcardQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.ScheduledJobCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsThumbnailQueueCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsThumbnailQueueCQ.java
index 08243dd0228c36218299bddc727df74b8d386f7b..e1d795adb463a6d2ff1b10ba59b0c0a2e9cc904f 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsThumbnailQueueCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsThumbnailQueueCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
-import org.codelibs.fesen.index.query.ExistsQueryBuilder;
-import org.codelibs.fesen.index.query.IdsQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
-import org.codelibs.fesen.index.query.MatchQueryBuilder;
-import org.codelibs.fesen.index.query.PrefixQueryBuilder;
-import org.codelibs.fesen.index.query.RangeQueryBuilder;
-import org.codelibs.fesen.index.query.RegexpQueryBuilder;
-import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
-import org.codelibs.fesen.index.query.TermQueryBuilder;
-import org.codelibs.fesen.index.query.TermsQueryBuilder;
-import org.codelibs.fesen.index.query.WildcardQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.ThumbnailQueueCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java
index 808638548b811b7c00dad03461b99a17da90ebec..a49fe9023f8a6338e295a938164dd9b9dbe20023 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
-import org.codelibs.fesen.index.query.ExistsQueryBuilder;
-import org.codelibs.fesen.index.query.IdsQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
-import org.codelibs.fesen.index.query.MatchQueryBuilder;
-import org.codelibs.fesen.index.query.PrefixQueryBuilder;
-import org.codelibs.fesen.index.query.RangeQueryBuilder;
-import org.codelibs.fesen.index.query.RegexpQueryBuilder;
-import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
-import org.codelibs.fesen.index.query.TermQueryBuilder;
-import org.codelibs.fesen.index.query.TermsQueryBuilder;
-import org.codelibs.fesen.index.query.WildcardQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.WebAuthenticationCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java
index 752f71ed8274afabc17aaa192d1941ca1ca574e1..9d54cbcb071841c0dd49bdd1d95019b703c4b896 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
-import org.codelibs.fesen.index.query.ExistsQueryBuilder;
-import org.codelibs.fesen.index.query.IdsQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
-import org.codelibs.fesen.index.query.MatchQueryBuilder;
-import org.codelibs.fesen.index.query.PrefixQueryBuilder;
-import org.codelibs.fesen.index.query.RangeQueryBuilder;
-import org.codelibs.fesen.index.query.RegexpQueryBuilder;
-import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
-import org.codelibs.fesen.index.query.TermQueryBuilder;
-import org.codelibs.fesen.index.query.TermsQueryBuilder;
-import org.codelibs.fesen.index.query.WildcardQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.WebConfigCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java
index 7d1050c3e5c2ea961a9a991c924e32c457cd4574..51df0462790e81aac84f9aebd42b51864fbea368 100644
--- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java
+++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java
@@ -27,23 +27,6 @@ import java.util.function.Function;
 
 import javax.annotation.Resource;
 
-import org.codelibs.fesen.action.ActionListener;
-import org.codelibs.fesen.action.DocWriteResponse.Result;
-import org.codelibs.fesen.action.admin.indices.refresh.RefreshResponse;
-import org.codelibs.fesen.action.bulk.BulkItemResponse;
-import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
-import org.codelibs.fesen.action.bulk.BulkResponse;
-import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
-import org.codelibs.fesen.action.delete.DeleteResponse;
-import org.codelibs.fesen.action.index.IndexRequestBuilder;
-import org.codelibs.fesen.action.index.IndexResponse;
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.action.search.SearchResponse;
-import org.codelibs.fesen.action.update.UpdateRequestBuilder;
-import org.codelibs.fesen.client.Client;
-import org.codelibs.fesen.index.seqno.SequenceNumbers;
-import org.codelibs.fesen.search.SearchHit;
-import org.codelibs.fesen.search.SearchHits;
 import org.codelibs.fess.es.log.allcommon.EsAbstractEntity.DocMeta;
 import org.codelibs.fess.es.log.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.dbflute.Entity;
@@ -58,6 +41,23 @@ import org.dbflute.cbean.result.ListResultBean;
 import org.dbflute.exception.FetchingOverSafetySizeException;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.ActionListener;
+import org.opensearch.action.DocWriteResponse.Result;
+import org.opensearch.action.admin.indices.refresh.RefreshResponse;
+import org.opensearch.action.bulk.BulkItemResponse;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.bulk.BulkResponse;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.delete.DeleteResponse;
+import org.opensearch.action.index.IndexRequestBuilder;
+import org.opensearch.action.index.IndexResponse;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.action.search.SearchResponse;
+import org.opensearch.action.update.UpdateRequestBuilder;
+import org.opensearch.client.Client;
+import org.opensearch.index.seqno.SequenceNumbers;
+import org.opensearch.search.SearchHit;
+import org.opensearch.search.SearchHits;
 
 /**
  * @param <ENTITY> The type of entity.
@@ -89,7 +89,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
     protected abstract <RESULT extends ENTITY> RESULT createEntity(Map<String, Object> source, Class<? extends RESULT> entityType);
 
     // ===================================================================================
-    //                                                                       Fesen
+    //                                                                       OpenSearch
     //                                                                              ======
     public RefreshResponse refresh() {
         return client.admin().indices().prepareRefresh(asEsIndex()).execute().actionGet(refreshTimeout);
diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionAggregation.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionAggregation.java
index 11e1739e7162cf0cbd451a2604b110d66e733b92..58cd8fe05b86a8e7b3deae2232a048860f4af08a 100644
--- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionAggregation.java
+++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionAggregation.java
@@ -20,33 +20,33 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-import org.codelibs.fesen.index.query.QueryBuilder;
-import org.codelibs.fesen.search.aggregations.AbstractAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.AggregationBuilders;
-import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.DateRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.dbflute.exception.InvalidQueryRegisteredException;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.search.aggregations.AbstractAggregationBuilder;
+import org.opensearch.search.aggregations.AggregationBuilders;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.DateRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionBean.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionBean.java
index d152b55cb31b5194e17f56ed12be62002002b724..e45a814e871cfa101ba3a3cb6d3eb76bd9a31a5b 100644
--- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionBean.java
+++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionBean.java
@@ -15,8 +15,6 @@
  */
 package org.codelibs.fess.es.log.allcommon;
 
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.core.TimeValue;
 import org.dbflute.cbean.ConditionBean;
 import org.dbflute.cbean.chelper.HpCBPurpose;
 import org.dbflute.cbean.chelper.HpColumnSpHandler;
@@ -39,6 +37,8 @@ import org.dbflute.dbmeta.accessory.DerivedTypeHandler;
 import org.dbflute.jdbc.StatementConfig;
 import org.dbflute.system.DBFluteSystem;
 import org.dbflute.twowaysql.style.BoundDateDisplayStyle;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.common.unit.TimeValue;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java
index e2e88d0b791cc0efc0364ea8ade1ecf305b2a10b..f9a8729e6f2556815148c93416ec2b94e77c4e0d 100644
--- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java
+++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java
@@ -26,32 +26,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.TimeZone;
 
-import org.codelibs.fesen.common.unit.Fuzziness;
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
-import org.codelibs.fesen.index.query.ExistsQueryBuilder;
-import org.codelibs.fesen.index.query.IdsQueryBuilder;
-import org.codelibs.fesen.index.query.MatchAllQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
-import org.codelibs.fesen.index.query.MatchQueryBuilder;
-import org.codelibs.fesen.index.query.MoreLikeThisQueryBuilder;
-import org.codelibs.fesen.index.query.PrefixQueryBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
-import org.codelibs.fesen.index.query.QueryBuilders;
-import org.codelibs.fesen.index.query.QueryStringQueryBuilder;
-import org.codelibs.fesen.index.query.RangeQueryBuilder;
-import org.codelibs.fesen.index.query.RegexpQueryBuilder;
-import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
-import org.codelibs.fesen.index.query.TermQueryBuilder;
-import org.codelibs.fesen.index.query.TermsQueryBuilder;
-import org.codelibs.fesen.index.query.WildcardQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
-import org.codelibs.fesen.index.query.functionscore.ScoreFunctionBuilder;
-import org.codelibs.fesen.search.sort.FieldSortBuilder;
-import org.codelibs.fesen.search.sort.SortBuilders;
-import org.codelibs.fesen.search.sort.SortOrder;
 import org.dbflute.cbean.ConditionBean;
 import org.dbflute.cbean.ConditionQuery;
 import org.dbflute.cbean.ckey.ConditionKey;
@@ -64,6 +38,32 @@ import org.dbflute.dbmeta.name.ColumnRealName;
 import org.dbflute.dbmeta.name.ColumnSqlName;
 import org.dbflute.exception.InvalidQueryRegisteredException;
 import org.dbflute.util.Srl;
+import org.opensearch.common.unit.Fuzziness;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchAllQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.MoreLikeThisQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.index.query.QueryStringQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
+import org.opensearch.index.query.functionscore.ScoreFunctionBuilder;
+import org.opensearch.search.sort.FieldSortBuilder;
+import org.opensearch.search.sort.SortBuilders;
+import org.opensearch.search.sort.SortOrder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractEntity.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractEntity.java
index 303adc1c322bf678332755bc1cbdb105aa9f085d..7d7feaa343cf4f11dd3d2f79a330a63035428518 100644
--- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractEntity.java
+++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractEntity.java
@@ -19,13 +19,13 @@ import java.io.Serializable;
 import java.util.Map;
 import java.util.Set;
 
-import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
-import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.dbflute.Entity;
 import org.dbflute.FunCustodial;
 import org.dbflute.dbmeta.accessory.EntityModifiedProperties;
 import org.dbflute.dbmeta.accessory.EntityUniqueDrivenProperties;
 import org.dbflute.util.DfCollectionUtil;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsPagingResultBean.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsPagingResultBean.java
index f7a021fc0482bbb81010965e4ab8ddf97bea3188..5ea308c5076f56ec2c926cf5c14dbbcb08594909 100644
--- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsPagingResultBean.java
+++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsPagingResultBean.java
@@ -16,9 +16,9 @@
 package org.codelibs.fess.es.log.allcommon;
 
 import org.apache.lucene.search.TotalHits;
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.search.aggregations.Aggregations;
 import org.dbflute.cbean.result.PagingResultBean;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.search.aggregations.Aggregations;
 
 /**
  * @param <ENTITY> The type of entity.
diff --git a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java
index 2e23f66237c50e496d43cb6512e4821f93ac26e6..15da407e0cd1adddbf5cd39509733fe2920301bc 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java
@@ -18,9 +18,6 @@ package org.codelibs.fess.es.log.bsbhv;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
-import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
-import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.log.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.log.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.log.bsentity.dbmeta.ClickLogDbm;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsFavoriteLogBhv.java b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsFavoriteLogBhv.java
index 4724e57e780c5ef0f61412f1b5ae8459a8dd2dac..f04ddbacb09b4031b45c067cf1a2741ebe434ae7 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsFavoriteLogBhv.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsFavoriteLogBhv.java
@@ -18,9 +18,6 @@ package org.codelibs.fess.es.log.bsbhv;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
-import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
-import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.log.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.log.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.log.bsentity.dbmeta.FavoriteLogDbm;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsSearchLogBhv.java b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsSearchLogBhv.java
index ad69c7705c298d49e8723c2d5e751be0309d2c7e..c2f91007d6bf6b3226ad7c737e622325ae4fc472 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsSearchLogBhv.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsSearchLogBhv.java
@@ -18,9 +18,6 @@ package org.codelibs.fess.es.log.bsbhv;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
-import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
-import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.log.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.log.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.log.bsentity.dbmeta.SearchLogDbm;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsUserInfoBhv.java b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsUserInfoBhv.java
index 4ca2eb8b9fc28b3f605d5fcbd5dbec0352471e84..7112efe7bb934c5aeb7c4423c1fda9017386f172 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsUserInfoBhv.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsUserInfoBhv.java
@@ -18,9 +18,6 @@ package org.codelibs.fess.es.log.bsbhv;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
-import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
-import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.log.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.log.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.log.bsentity.dbmeta.UserInfoDbm;
@@ -34,6 +31,9 @@ import org.dbflute.cbean.result.ListResultBean;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java
index fa1cf0c989faf08655e4c678b2a9e471014d0a91..4b3f3ace09047a79fbc4ea7a0361935e7ed56721 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java
@@ -19,8 +19,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.log.bsentity.dbmeta.ClickLogDbm;
 import org.codelibs.fess.es.log.cbean.ClickLogCB;
@@ -29,6 +27,8 @@ import org.codelibs.fess.es.log.cbean.ca.bs.BsClickLogCA;
 import org.codelibs.fess.es.log.cbean.cq.ClickLogCQ;
 import org.codelibs.fess.es.log.cbean.cq.bs.BsClickLogCQ;
 import org.dbflute.cbean.ConditionQuery;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java
index 980e35e73d7eb959d2ec86727dd59d1532676ba0..de16a3c2fcb0b60b530c07e3f4fa8aa3a257334c 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java
@@ -19,8 +19,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.log.bsentity.dbmeta.FavoriteLogDbm;
 import org.codelibs.fess.es.log.cbean.FavoriteLogCB;
@@ -29,6 +27,8 @@ import org.codelibs.fess.es.log.cbean.ca.bs.BsFavoriteLogCA;
 import org.codelibs.fess.es.log.cbean.cq.FavoriteLogCQ;
 import org.codelibs.fess.es.log.cbean.cq.bs.BsFavoriteLogCQ;
 import org.dbflute.cbean.ConditionQuery;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java
index 7e9c6096efa24e7b29dc355939fb23a723f13edf..c16c9e6ae4ad08b815a8dc9e446ce00f49fa07c7 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java
@@ -19,8 +19,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.log.bsentity.dbmeta.SearchLogDbm;
 import org.codelibs.fess.es.log.cbean.SearchLogCB;
@@ -29,6 +27,8 @@ import org.codelibs.fess.es.log.cbean.ca.bs.BsSearchLogCA;
 import org.codelibs.fess.es.log.cbean.cq.SearchLogCQ;
 import org.codelibs.fess.es.log.cbean.cq.bs.BsSearchLogCQ;
 import org.dbflute.cbean.ConditionQuery;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsUserInfoCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsUserInfoCB.java
index 340eb04aadf8299c9e64431a56156f8ea227d188..436d564a2ae45bd4c0f5d16e70c1563938a38243 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsUserInfoCB.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsUserInfoCB.java
@@ -19,8 +19,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.log.bsentity.dbmeta.UserInfoDbm;
 import org.codelibs.fess.es.log.cbean.UserInfoCB;
@@ -29,6 +27,8 @@ import org.codelibs.fess.es.log.cbean.ca.bs.BsUserInfoCA;
 import org.codelibs.fess.es.log.cbean.cq.UserInfoCQ;
 import org.codelibs.fess.es.log.cbean.cq.bs.BsUserInfoCQ;
 import org.dbflute.cbean.ConditionQuery;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsClickLogCA.java b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsClickLogCA.java
index fd067694b648acf8b9d78b2bc4cafe95e7c534e3..0c52d59505402e90d51d80f70c4292046a45bd10 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsClickLogCA.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsClickLogCA.java
@@ -15,34 +15,34 @@
  */
 package org.codelibs.fess.es.log.cbean.ca.bs;
 
-import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.DateRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.log.cbean.ca.ClickLogCA;
 import org.codelibs.fess.es.log.cbean.cq.ClickLogCQ;
 import org.codelibs.fess.es.log.cbean.cq.bs.BsClickLogCQ;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.DateRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsFavoriteLogCA.java b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsFavoriteLogCA.java
index d2d43926165a4d968d3ed2ebe845e05c622e300a..042a7e7e948e65d4ebe244e936d0dfa1f1f21d55 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsFavoriteLogCA.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsFavoriteLogCA.java
@@ -15,24 +15,24 @@
  */
 package org.codelibs.fess.es.log.cbean.ca.bs;
 
-import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.DateRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.log.cbean.ca.FavoriteLogCA;
 import org.codelibs.fess.es.log.cbean.cq.FavoriteLogCQ;
 import org.codelibs.fess.es.log.cbean.cq.bs.BsFavoriteLogCQ;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.DateRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsSearchLogCA.java b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsSearchLogCA.java
index 9a5affd4b13116f65cb071c9bc79d3350dc578e6..7641c6eefc2c736402b77c787fe5ef76ba7904a2 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsSearchLogCA.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsSearchLogCA.java
@@ -15,34 +15,34 @@
  */
 package org.codelibs.fess.es.log.cbean.ca.bs;
 
-import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.DateRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.log.cbean.ca.SearchLogCA;
 import org.codelibs.fess.es.log.cbean.cq.SearchLogCQ;
 import org.codelibs.fess.es.log.cbean.cq.bs.BsSearchLogCQ;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.DateRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsUserInfoCA.java b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsUserInfoCA.java
index 1b1636026a4e42e7eb8030d5bd0f9eaae9d5b1f1..d3be567fb76eb427de7cd213c08a0068e4ee858c 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsUserInfoCA.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsUserInfoCA.java
@@ -15,21 +15,21 @@
  */
 package org.codelibs.fess.es.log.cbean.ca.bs;
 
-import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.DateRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.log.cbean.ca.UserInfoCA;
 import org.codelibs.fess.es.log.cbean.cq.UserInfoCQ;
 import org.codelibs.fess.es.log.cbean.cq.bs.BsUserInfoCQ;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.DateRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java
index 7c9bd85fd2825034ca616c6738b98fa6effa8014..be9c1624418d10aa7c8d1c3aea58099dbc140505 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
-import org.codelibs.fesen.index.query.ExistsQueryBuilder;
-import org.codelibs.fesen.index.query.IdsQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
-import org.codelibs.fesen.index.query.MatchQueryBuilder;
-import org.codelibs.fesen.index.query.PrefixQueryBuilder;
-import org.codelibs.fesen.index.query.RangeQueryBuilder;
-import org.codelibs.fesen.index.query.RegexpQueryBuilder;
-import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
-import org.codelibs.fesen.index.query.TermQueryBuilder;
-import org.codelibs.fesen.index.query.TermsQueryBuilder;
-import org.codelibs.fesen.index.query.WildcardQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.log.cbean.cq.ClickLogCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java
index 80c706e45f3f3d243571e44d271bdcc348bbf69b..4527909d1cb7a41863985e98491021d0bad16ea0 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
-import org.codelibs.fesen.index.query.ExistsQueryBuilder;
-import org.codelibs.fesen.index.query.IdsQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
-import org.codelibs.fesen.index.query.MatchQueryBuilder;
-import org.codelibs.fesen.index.query.PrefixQueryBuilder;
-import org.codelibs.fesen.index.query.RangeQueryBuilder;
-import org.codelibs.fesen.index.query.RegexpQueryBuilder;
-import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
-import org.codelibs.fesen.index.query.TermQueryBuilder;
-import org.codelibs.fesen.index.query.TermsQueryBuilder;
-import org.codelibs.fesen.index.query.WildcardQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.log.cbean.cq.FavoriteLogCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java
index 5d323333bd12046bc7d7c05ebf203fed88f95740..c364e845c89d26259c862abbd16e7c3f997925a9 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
-import org.codelibs.fesen.index.query.ExistsQueryBuilder;
-import org.codelibs.fesen.index.query.IdsQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
-import org.codelibs.fesen.index.query.MatchQueryBuilder;
-import org.codelibs.fesen.index.query.PrefixQueryBuilder;
-import org.codelibs.fesen.index.query.RangeQueryBuilder;
-import org.codelibs.fesen.index.query.RegexpQueryBuilder;
-import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
-import org.codelibs.fesen.index.query.TermQueryBuilder;
-import org.codelibs.fesen.index.query.TermsQueryBuilder;
-import org.codelibs.fesen.index.query.WildcardQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.log.cbean.cq.SearchLogCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java
index 0d48d0d31db6135b116ff510385dfac1ace58ee6..423b42c948a296325d618833f25ea53bcb96ed6f 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java
@@ -19,21 +19,21 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
-import org.codelibs.fesen.index.query.ExistsQueryBuilder;
-import org.codelibs.fesen.index.query.IdsQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
-import org.codelibs.fesen.index.query.MatchQueryBuilder;
-import org.codelibs.fesen.index.query.RangeQueryBuilder;
-import org.codelibs.fesen.index.query.TermQueryBuilder;
-import org.codelibs.fesen.index.query.TermsQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.log.cbean.cq.UserInfoCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/query/StoredLtrQueryBuilder.java b/src/main/java/org/codelibs/fess/es/query/StoredLtrQueryBuilder.java
index b56cf9e4cfc6cf6299af615cd0d292bc07e000a7..95ad140b709b83a142365b0508b65147fd010ffe 100644
--- a/src/main/java/org/codelibs/fess/es/query/StoredLtrQueryBuilder.java
+++ b/src/main/java/org/codelibs/fess/es/query/StoredLtrQueryBuilder.java
@@ -21,15 +21,15 @@ import java.util.Map;
 import java.util.Objects;
 
 import org.apache.lucene.search.Query;
-import org.codelibs.fesen.common.ParseField;
-import org.codelibs.fesen.common.io.stream.NamedWriteable;
-import org.codelibs.fesen.common.io.stream.StreamOutput;
-import org.codelibs.fesen.common.xcontent.ObjectParser;
-import org.codelibs.fesen.common.xcontent.XContentBuilder;
-import org.codelibs.fesen.common.xcontent.XContentParser;
-import org.codelibs.fesen.index.query.AbstractQueryBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
-import org.codelibs.fesen.index.query.QueryShardContext;
+import org.opensearch.common.ParseField;
+import org.opensearch.common.io.stream.NamedWriteable;
+import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.common.xcontent.ObjectParser;
+import org.opensearch.common.xcontent.XContentBuilder;
+import org.opensearch.common.xcontent.XContentParser;
+import org.opensearch.index.query.AbstractQueryBuilder;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryShardContext;
 
 public class StoredLtrQueryBuilder extends AbstractQueryBuilder<StoredLtrQueryBuilder> implements NamedWriteable {
     public static final String NAME = "sltr";
diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java
index 6e80e6444bd6be94544e0da94a5016da78300af9..addfe1c82139d3d256a0442915a12401588d00f9 100644
--- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java
+++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java
@@ -27,23 +27,6 @@ import java.util.function.Function;
 
 import javax.annotation.Resource;
 
-import org.codelibs.fesen.action.ActionListener;
-import org.codelibs.fesen.action.DocWriteResponse.Result;
-import org.codelibs.fesen.action.admin.indices.refresh.RefreshResponse;
-import org.codelibs.fesen.action.bulk.BulkItemResponse;
-import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
-import org.codelibs.fesen.action.bulk.BulkResponse;
-import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
-import org.codelibs.fesen.action.delete.DeleteResponse;
-import org.codelibs.fesen.action.index.IndexRequestBuilder;
-import org.codelibs.fesen.action.index.IndexResponse;
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.action.search.SearchResponse;
-import org.codelibs.fesen.action.update.UpdateRequestBuilder;
-import org.codelibs.fesen.client.Client;
-import org.codelibs.fesen.index.seqno.SequenceNumbers;
-import org.codelibs.fesen.search.SearchHit;
-import org.codelibs.fesen.search.SearchHits;
 import org.codelibs.fess.es.user.allcommon.EsAbstractEntity.DocMeta;
 import org.codelibs.fess.es.user.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.dbflute.Entity;
@@ -58,6 +41,23 @@ import org.dbflute.cbean.result.ListResultBean;
 import org.dbflute.exception.FetchingOverSafetySizeException;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.ActionListener;
+import org.opensearch.action.DocWriteResponse.Result;
+import org.opensearch.action.admin.indices.refresh.RefreshResponse;
+import org.opensearch.action.bulk.BulkItemResponse;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.bulk.BulkResponse;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.delete.DeleteResponse;
+import org.opensearch.action.index.IndexRequestBuilder;
+import org.opensearch.action.index.IndexResponse;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.action.search.SearchResponse;
+import org.opensearch.action.update.UpdateRequestBuilder;
+import org.opensearch.client.Client;
+import org.opensearch.index.seqno.SequenceNumbers;
+import org.opensearch.search.SearchHit;
+import org.opensearch.search.SearchHits;
 
 /**
  * @param <ENTITY> The type of entity.
@@ -89,7 +89,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
     protected abstract <RESULT extends ENTITY> RESULT createEntity(Map<String, Object> source, Class<? extends RESULT> entityType);
 
     // ===================================================================================
-    //                                                                       Fesen
+    //                                                                       OpenSearch
     //                                                                              ======
     public RefreshResponse refresh() {
         return client.admin().indices().prepareRefresh(asEsIndex()).execute().actionGet(refreshTimeout);
diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionAggregation.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionAggregation.java
index 9a84203f2d9601c3b2aa432871199a7ae836c2ae..e17967b593d77283d2e71eed240aea482ed9144e 100644
--- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionAggregation.java
+++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionAggregation.java
@@ -20,33 +20,33 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-import org.codelibs.fesen.index.query.QueryBuilder;
-import org.codelibs.fesen.search.aggregations.AbstractAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.AggregationBuilders;
-import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.DateRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.dbflute.exception.InvalidQueryRegisteredException;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.search.aggregations.AbstractAggregationBuilder;
+import org.opensearch.search.aggregations.AggregationBuilders;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.DateRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionBean.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionBean.java
index ed98652d5bed90539999fa0658373e6f31c765bf..34ddb715c8814a029e2492356158837a9ff72fc9 100644
--- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionBean.java
+++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionBean.java
@@ -15,8 +15,6 @@
  */
 package org.codelibs.fess.es.user.allcommon;
 
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.core.TimeValue;
 import org.dbflute.cbean.ConditionBean;
 import org.dbflute.cbean.chelper.HpCBPurpose;
 import org.dbflute.cbean.chelper.HpColumnSpHandler;
@@ -39,6 +37,8 @@ import org.dbflute.dbmeta.accessory.DerivedTypeHandler;
 import org.dbflute.jdbc.StatementConfig;
 import org.dbflute.system.DBFluteSystem;
 import org.dbflute.twowaysql.style.BoundDateDisplayStyle;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.common.unit.TimeValue;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java
index f23f7af64ecb2abd16f7c76c6309f8aa2e4ab7b2..7d5bc4232a421f617885d308497bfdb8db4e6005 100644
--- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java
+++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java
@@ -26,32 +26,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.TimeZone;
 
-import org.codelibs.fesen.common.unit.Fuzziness;
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
-import org.codelibs.fesen.index.query.ExistsQueryBuilder;
-import org.codelibs.fesen.index.query.IdsQueryBuilder;
-import org.codelibs.fesen.index.query.MatchAllQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
-import org.codelibs.fesen.index.query.MatchQueryBuilder;
-import org.codelibs.fesen.index.query.MoreLikeThisQueryBuilder;
-import org.codelibs.fesen.index.query.PrefixQueryBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
-import org.codelibs.fesen.index.query.QueryBuilders;
-import org.codelibs.fesen.index.query.QueryStringQueryBuilder;
-import org.codelibs.fesen.index.query.RangeQueryBuilder;
-import org.codelibs.fesen.index.query.RegexpQueryBuilder;
-import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
-import org.codelibs.fesen.index.query.TermQueryBuilder;
-import org.codelibs.fesen.index.query.TermsQueryBuilder;
-import org.codelibs.fesen.index.query.WildcardQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
-import org.codelibs.fesen.index.query.functionscore.ScoreFunctionBuilder;
-import org.codelibs.fesen.search.sort.FieldSortBuilder;
-import org.codelibs.fesen.search.sort.SortBuilders;
-import org.codelibs.fesen.search.sort.SortOrder;
 import org.dbflute.cbean.ConditionBean;
 import org.dbflute.cbean.ConditionQuery;
 import org.dbflute.cbean.ckey.ConditionKey;
@@ -64,6 +38,32 @@ import org.dbflute.dbmeta.name.ColumnRealName;
 import org.dbflute.dbmeta.name.ColumnSqlName;
 import org.dbflute.exception.InvalidQueryRegisteredException;
 import org.dbflute.util.Srl;
+import org.opensearch.common.unit.Fuzziness;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchAllQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.MoreLikeThisQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.index.query.QueryStringQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
+import org.opensearch.index.query.functionscore.ScoreFunctionBuilder;
+import org.opensearch.search.sort.FieldSortBuilder;
+import org.opensearch.search.sort.SortBuilders;
+import org.opensearch.search.sort.SortOrder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractEntity.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractEntity.java
index 0931923b226fe339e7b64f944212903a42f39da6..90ccda0159c6e3f7f9aa7944ae7abaabbf4e8540 100644
--- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractEntity.java
+++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractEntity.java
@@ -19,13 +19,13 @@ import java.io.Serializable;
 import java.util.Map;
 import java.util.Set;
 
-import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
-import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.dbflute.Entity;
 import org.dbflute.FunCustodial;
 import org.dbflute.dbmeta.accessory.EntityModifiedProperties;
 import org.dbflute.dbmeta.accessory.EntityUniqueDrivenProperties;
 import org.dbflute.util.DfCollectionUtil;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsPagingResultBean.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsPagingResultBean.java
index db9ceb3659453023a0c16aeb5e38439a898115c1..cd1713ffc0dd1251fb511d60f09c0e19bfb3a79b 100644
--- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsPagingResultBean.java
+++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsPagingResultBean.java
@@ -16,9 +16,9 @@
 package org.codelibs.fess.es.user.allcommon;
 
 import org.apache.lucene.search.TotalHits;
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.search.aggregations.Aggregations;
 import org.dbflute.cbean.result.PagingResultBean;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.search.aggregations.Aggregations;
 
 /**
  * @param <ENTITY> The type of entity.
diff --git a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsGroupBhv.java b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsGroupBhv.java
index 5f92053b2ef86f05fac866083895e76bbbe08b2f..111bd3f94608dd74d09700ffe449e9054cea932e 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsGroupBhv.java
+++ b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsGroupBhv.java
@@ -18,9 +18,6 @@ package org.codelibs.fess.es.user.bsbhv;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
-import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
-import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.user.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.user.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.user.bsentity.dbmeta.GroupDbm;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsRoleBhv.java b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsRoleBhv.java
index 1797e6f34a707b5d54db9b424f436cb122628d73..ba89f3472879d698959b9020b7090f941c96bc82 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsRoleBhv.java
+++ b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsRoleBhv.java
@@ -18,9 +18,6 @@ package org.codelibs.fess.es.user.bsbhv;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
-import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
-import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.user.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.user.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.user.bsentity.dbmeta.RoleDbm;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsUserBhv.java b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsUserBhv.java
index 679ffcf0cd79329cb226137ea1791bdc931a2c50..ae2bba7ff7890d0ba422891a0eb48a384614beba 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsUserBhv.java
+++ b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsUserBhv.java
@@ -18,9 +18,6 @@ package org.codelibs.fess.es.user.bsbhv;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
-import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
-import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.user.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.user.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.user.bsentity.dbmeta.UserDbm;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsGroupCB.java b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsGroupCB.java
index adb0be592352c22ae216640a4138f3958e9dd4db..5d2375470baa21bbbe0a0532aff166336f8b45cf 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsGroupCB.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsGroupCB.java
@@ -19,8 +19,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.user.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.user.bsentity.dbmeta.GroupDbm;
 import org.codelibs.fess.es.user.cbean.GroupCB;
@@ -29,6 +27,8 @@ import org.codelibs.fess.es.user.cbean.ca.bs.BsGroupCA;
 import org.codelibs.fess.es.user.cbean.cq.GroupCQ;
 import org.codelibs.fess.es.user.cbean.cq.bs.BsGroupCQ;
 import org.dbflute.cbean.ConditionQuery;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsRoleCB.java b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsRoleCB.java
index 42621f465f675a31e84d704d90fc2834b6a5ee10..254aa00dc47b3b3eba407a9d75cf794cd028a7fb 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsRoleCB.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsRoleCB.java
@@ -19,8 +19,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.user.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.user.bsentity.dbmeta.RoleDbm;
 import org.codelibs.fess.es.user.cbean.RoleCB;
@@ -29,6 +27,8 @@ import org.codelibs.fess.es.user.cbean.ca.bs.BsRoleCA;
 import org.codelibs.fess.es.user.cbean.cq.RoleCQ;
 import org.codelibs.fess.es.user.cbean.cq.bs.BsRoleCQ;
 import org.dbflute.cbean.ConditionQuery;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsUserCB.java b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsUserCB.java
index bf1a5d225a4067c17826e9bb460ff4daf15dc2c1..27758527ee0386c80703c8e485ca3c6f5f89d306 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsUserCB.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsUserCB.java
@@ -19,8 +19,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.user.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.user.bsentity.dbmeta.UserDbm;
 import org.codelibs.fess.es.user.cbean.UserCB;
@@ -29,6 +27,8 @@ import org.codelibs.fess.es.user.cbean.ca.bs.BsUserCA;
 import org.codelibs.fess.es.user.cbean.cq.UserCQ;
 import org.codelibs.fess.es.user.cbean.cq.bs.BsUserCQ;
 import org.dbflute.cbean.ConditionQuery;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsGroupCA.java b/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsGroupCA.java
index 9c309a8f4060906e54d1b80833f1ebf6dd84d38c..7b66b21d3830fe7db33136cb57e1be65431f2f39 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsGroupCA.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsGroupCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.user.cbean.ca.bs;
 
-import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.user.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.user.cbean.ca.GroupCA;
 import org.codelibs.fess.es.user.cbean.cq.GroupCQ;
 import org.codelibs.fess.es.user.cbean.cq.bs.BsGroupCQ;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsRoleCA.java b/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsRoleCA.java
index 3a9a16322c1f1b17d6e59e06d52dc80a541ffe7e..21cef0e85d009b8a4a7b84601adfa9a7c20408f1 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsRoleCA.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsRoleCA.java
@@ -15,22 +15,22 @@
  */
 package org.codelibs.fess.es.user.cbean.ca.bs;
 
-import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.user.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.user.cbean.ca.RoleCA;
 import org.codelibs.fess.es.user.cbean.cq.RoleCQ;
 import org.codelibs.fess.es.user.cbean.cq.bs.BsRoleCQ;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsUserCA.java b/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsUserCA.java
index 65317353e9bc9e2961f2918ad902215be5b114a9..9a9cdc427026f272b97171517371161a08f0dbf2 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsUserCA.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsUserCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.user.cbean.ca.bs;
 
-import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.user.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.user.cbean.ca.UserCA;
 import org.codelibs.fess.es.user.cbean.cq.UserCQ;
 import org.codelibs.fess.es.user.cbean.cq.bs.BsUserCQ;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java
index d457f702a74bda7c6b154009b39377343b69e6c8..e1d2a194a99f4341fdf0daa333006f2241f9ff70 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
-import org.codelibs.fesen.index.query.ExistsQueryBuilder;
-import org.codelibs.fesen.index.query.IdsQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
-import org.codelibs.fesen.index.query.MatchQueryBuilder;
-import org.codelibs.fesen.index.query.PrefixQueryBuilder;
-import org.codelibs.fesen.index.query.RangeQueryBuilder;
-import org.codelibs.fesen.index.query.RegexpQueryBuilder;
-import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
-import org.codelibs.fesen.index.query.TermQueryBuilder;
-import org.codelibs.fesen.index.query.TermsQueryBuilder;
-import org.codelibs.fesen.index.query.WildcardQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.user.cbean.cq.GroupCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java
index 221d0984f9d75f0f6088d405c3b2cd752be8b192..24eea5b215bf11ed8e8a0df055d762d44e40e528 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
-import org.codelibs.fesen.index.query.ExistsQueryBuilder;
-import org.codelibs.fesen.index.query.IdsQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
-import org.codelibs.fesen.index.query.MatchQueryBuilder;
-import org.codelibs.fesen.index.query.PrefixQueryBuilder;
-import org.codelibs.fesen.index.query.RangeQueryBuilder;
-import org.codelibs.fesen.index.query.RegexpQueryBuilder;
-import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
-import org.codelibs.fesen.index.query.TermQueryBuilder;
-import org.codelibs.fesen.index.query.TermsQueryBuilder;
-import org.codelibs.fesen.index.query.WildcardQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.user.cbean.cq.RoleCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java
index 1a4256e32a52bde211564ecca763d1cf261c6483..372a27e1986a9b594f5ac5ba93bc1e297086b0db 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
-import org.codelibs.fesen.index.query.ExistsQueryBuilder;
-import org.codelibs.fesen.index.query.IdsQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
-import org.codelibs.fesen.index.query.MatchQueryBuilder;
-import org.codelibs.fesen.index.query.PrefixQueryBuilder;
-import org.codelibs.fesen.index.query.RangeQueryBuilder;
-import org.codelibs.fesen.index.query.RegexpQueryBuilder;
-import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
-import org.codelibs.fesen.index.query.TermQueryBuilder;
-import org.codelibs.fesen.index.query.TermsQueryBuilder;
-import org.codelibs.fesen.index.query.WildcardQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.user.cbean.cq.UserCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/exec/Crawler.java b/src/main/java/org/codelibs/fess/exec/Crawler.java
index 3750c8f05d6c42f099e4161809f7dee2f1dba385..e6cdb1be740afea9edd77df7c29b35b7ed924d96 100644
--- a/src/main/java/org/codelibs/fess/exec/Crawler.java
+++ b/src/main/java/org/codelibs/fess/exec/Crawler.java
@@ -45,9 +45,6 @@ import org.codelibs.core.lang.ThreadUtil;
 import org.codelibs.core.misc.DynamicProperties;
 import org.codelibs.core.timer.TimeoutManager;
 import org.codelibs.core.timer.TimeoutTask;
-import org.codelibs.fesen.monitor.jvm.JvmInfo;
-import org.codelibs.fesen.monitor.os.OsProbe;
-import org.codelibs.fesen.monitor.process.ProcessProbe;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.service.CrawlingInfoService;
 import org.codelibs.fess.app.service.PathMappingService;
@@ -73,6 +70,9 @@ import org.lastaflute.core.mail.Postbox;
 import org.lastaflute.di.core.external.GenericExternalContext;
 import org.lastaflute.di.core.external.GenericExternalContextComponentDefRegister;
 import org.lastaflute.di.core.factory.SingletonLaContainerFactory;
+import org.opensearch.monitor.jvm.JvmInfo;
+import org.opensearch.monitor.os.OsProbe;
+import org.opensearch.monitor.process.ProcessProbe;
 
 public class Crawler {
 
diff --git a/src/main/java/org/codelibs/fess/exec/SuggestCreator.java b/src/main/java/org/codelibs/fess/exec/SuggestCreator.java
index d213982b53944090605e967093b03d626eb7a61f..1f23763caccc78eadafbcdd4249ec2a236b078f9 100644
--- a/src/main/java/org/codelibs/fess/exec/SuggestCreator.java
+++ b/src/main/java/org/codelibs/fess/exec/SuggestCreator.java
@@ -29,9 +29,6 @@ import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.misc.DynamicProperties;
 import org.codelibs.core.timer.TimeoutManager;
 import org.codelibs.core.timer.TimeoutTask;
-import org.codelibs.fesen.monitor.jvm.JvmInfo;
-import org.codelibs.fesen.monitor.os.OsProbe;
-import org.codelibs.fesen.monitor.process.ProcessProbe;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.crawler.client.FesenClient;
 import org.codelibs.fess.es.client.SearchEngineClient;
@@ -45,6 +42,9 @@ import org.kohsuke.args4j.Option;
 import org.lastaflute.di.core.external.GenericExternalContext;
 import org.lastaflute.di.core.external.GenericExternalContextComponentDefRegister;
 import org.lastaflute.di.core.factory.SingletonLaContainerFactory;
+import org.opensearch.monitor.jvm.JvmInfo;
+import org.opensearch.monitor.os.OsProbe;
+import org.opensearch.monitor.process.ProcessProbe;
 
 public class SuggestCreator {
 
diff --git a/src/main/java/org/codelibs/fess/exec/ThumbnailGenerator.java b/src/main/java/org/codelibs/fess/exec/ThumbnailGenerator.java
index 19d9fbe615143de086363ca8e111fa30291b9beb..610c0ef8c384d9945f23881b5a682f587b5e79d4 100644
--- a/src/main/java/org/codelibs/fess/exec/ThumbnailGenerator.java
+++ b/src/main/java/org/codelibs/fess/exec/ThumbnailGenerator.java
@@ -29,9 +29,6 @@ import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.misc.DynamicProperties;
 import org.codelibs.core.timer.TimeoutManager;
 import org.codelibs.core.timer.TimeoutTask;
-import org.codelibs.fesen.monitor.jvm.JvmInfo;
-import org.codelibs.fesen.monitor.os.OsProbe;
-import org.codelibs.fesen.monitor.process.ProcessProbe;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.crawler.client.FesenClient;
 import org.codelibs.fess.es.client.SearchEngineClient;
@@ -44,6 +41,9 @@ import org.kohsuke.args4j.Option;
 import org.lastaflute.di.core.external.GenericExternalContext;
 import org.lastaflute.di.core.external.GenericExternalContextComponentDefRegister;
 import org.lastaflute.di.core.factory.SingletonLaContainerFactory;
+import org.opensearch.monitor.jvm.JvmInfo;
+import org.opensearch.monitor.os.OsProbe;
+import org.opensearch.monitor.process.ProcessProbe;
 
 public class ThumbnailGenerator {
 
diff --git a/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java b/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java
index 24b5b373221a758f5c71e982f2168c651cb5a23a..aadf1226f2d5fd4a2ae22dff3ad81bcf37ebb97b 100644
--- a/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java
@@ -31,12 +31,6 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.security.MessageDigestUtil;
-import org.codelibs.fesen.index.query.QueryBuilders;
-import org.codelibs.fesen.search.aggregations.AggregationBuilders;
-import org.codelibs.fesen.search.aggregations.BucketOrder;
-import org.codelibs.fesen.search.aggregations.bucket.terms.Terms;
-import org.codelibs.fesen.search.aggregations.bucket.terms.Terms.Bucket;
-import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.service.CrawlingInfoService;
 import org.codelibs.fess.es.client.SearchEngineClient;
@@ -46,6 +40,12 @@ import org.codelibs.fess.es.config.exentity.CrawlingInfoParam;
 import org.codelibs.fess.exception.FessSystemException;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.util.ComponentUtil;
+import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.search.aggregations.AggregationBuilders;
+import org.opensearch.search.aggregations.BucketOrder;
+import org.opensearch.search.aggregations.bucket.terms.Terms;
+import org.opensearch.search.aggregations.bucket.terms.Terms.Bucket;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
 
 public class CrawlingInfoHelper {
     private static final Logger logger = LogManager.getLogger(CrawlingInfoHelper.class);
diff --git a/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java b/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java
index 926e31e73160367735b98ae0fee3b0fc05b2bc69..df870552ab78ed3fe175bfabbe6bf23d8aab0bed 100644
--- a/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java
@@ -25,8 +25,6 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.lang.ThreadUtil;
-import org.codelibs.fesen.index.query.QueryBuilder;
-import org.codelibs.fesen.index.query.QueryBuilders;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.service.FailureUrlService;
 import org.codelibs.fess.ds.DataStore;
@@ -36,6 +34,8 @@ import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.es.config.exentity.DataConfig;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.util.ComponentUtil;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
 
 public class DataIndexHelper {
 
diff --git a/src/main/java/org/codelibs/fess/helper/IndexingHelper.java b/src/main/java/org/codelibs/fess/helper/IndexingHelper.java
index c2cb9b5f95fa094b9742c06b071b520dd061505a..2a58399a713607a4055190e7f67090ac40a1dc06 100644
--- a/src/main/java/org/codelibs/fess/helper/IndexingHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/IndexingHelper.java
@@ -21,15 +21,15 @@ import java.util.Map;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.codelibs.fesen.action.search.SearchResponse;
-import org.codelibs.fesen.index.query.QueryBuilder;
-import org.codelibs.fesen.index.query.QueryBuilders;
 import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.thumbnail.ThumbnailManager;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.DocList;
 import org.codelibs.fess.util.MemoryUtil;
+import org.opensearch.action.search.SearchResponse;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
 
 public class IndexingHelper {
     private static final Logger logger = LogManager.getLogger(IndexingHelper.class);
diff --git a/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java b/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java
index 3b029a5d3cc809f3e602766164b5282356c01626..7a4dacbdcaa876bdb3159b4cb1ad507008a22394 100644
--- a/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java
@@ -28,12 +28,6 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.misc.Tuple3;
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
-import org.codelibs.fesen.index.query.QueryBuilders;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
-import org.codelibs.fesen.index.query.functionscore.ScoreFunctionBuilder;
-import org.codelibs.fesen.index.query.functionscore.ScoreFunctionBuilders;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.entity.SearchRequestParams.SearchRequestType;
 import org.codelibs.fess.es.client.SearchEngineClient;
@@ -43,6 +37,12 @@ import org.codelibs.fess.es.config.exentity.KeyMatch;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.DocumentUtil;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
+import org.opensearch.index.query.functionscore.ScoreFunctionBuilder;
+import org.opensearch.index.query.functionscore.ScoreFunctionBuilders;
 
 public class KeyMatchHelper extends AbstractConfigHelper {
     private static final Logger logger = LogManager.getLogger(KeyMatchHelper.class);
diff --git a/src/main/java/org/codelibs/fess/helper/LanguageHelper.java b/src/main/java/org/codelibs/fess/helper/LanguageHelper.java
index 0d2d4ca12efee83337a73324af096bcfa1839bc7..b6ba2612dfacc2c7710c063c4d2b1fa8c248934d 100644
--- a/src/main/java/org/codelibs/fess/helper/LanguageHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/LanguageHelper.java
@@ -26,10 +26,10 @@ import org.apache.logging.log4j.Logger;
 import org.apache.tika.language.detect.LanguageDetector;
 import org.apache.tika.language.detect.LanguageResult;
 import org.codelibs.core.lang.StringUtil;
-import org.codelibs.fesen.script.Script;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.DocumentUtil;
+import org.opensearch.script.Script;
 
 public class LanguageHelper {
     private static final Logger logger = LogManager.getLogger(LanguageHelper.class);
diff --git a/src/main/java/org/codelibs/fess/helper/QueryHelper.java b/src/main/java/org/codelibs/fess/helper/QueryHelper.java
index 7c097cb4976e336fb01b1cccfa9709c146348ec8..72202fc18d31e391f67c2724e6f69a2aedd0d360 100644
--- a/src/main/java/org/codelibs/fess/helper/QueryHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/QueryHelper.java
@@ -54,19 +54,6 @@ import org.apache.lucene.search.WildcardQuery;
 import org.apache.lucene.util.BytesRef;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.misc.Pair;
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.common.unit.Fuzziness;
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
-import org.codelibs.fesen.index.query.QueryBuilders;
-import org.codelibs.fesen.index.query.RangeQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
-import org.codelibs.fesen.index.query.functionscore.ScoreFunctionBuilder;
-import org.codelibs.fesen.index.query.functionscore.ScoreFunctionBuilders;
-import org.codelibs.fesen.search.rescore.RescorerBuilder;
-import org.codelibs.fesen.search.sort.SortBuilder;
-import org.codelibs.fesen.search.sort.SortBuilders;
-import org.codelibs.fesen.search.sort.SortOrder;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.entity.FacetInfo;
 import org.codelibs.fess.entity.GeoInfo;
@@ -80,6 +67,19 @@ import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.optional.OptionalThing;
 import org.lastaflute.core.message.UserMessages;
 import org.lastaflute.web.util.LaRequestUtil;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.common.unit.Fuzziness;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
+import org.opensearch.index.query.functionscore.ScoreFunctionBuilder;
+import org.opensearch.index.query.functionscore.ScoreFunctionBuilders;
+import org.opensearch.search.rescore.RescorerBuilder;
+import org.opensearch.search.sort.SortBuilder;
+import org.opensearch.search.sort.SortBuilders;
+import org.opensearch.search.sort.SortOrder;
 
 public class QueryHelper {
     private static final Logger logger = LogManager.getLogger(QueryHelper.class);
diff --git a/src/main/java/org/codelibs/fess/helper/SearchHelper.java b/src/main/java/org/codelibs/fess/helper/SearchHelper.java
index df0f7c741d358b3f2fe57580d33a084ce096be3f..c283789084c344fae7f630a7df6ef17c471adaf8 100644
--- a/src/main/java/org/codelibs/fess/helper/SearchHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/SearchHelper.java
@@ -33,15 +33,6 @@ import javax.servlet.http.HttpServletRequest;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.lang.StringUtil;
-import org.codelibs.fesen.FesenException;
-import org.codelibs.fesen.action.DocWriteResponse.Result;
-import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
-import org.codelibs.fesen.action.bulk.BulkResponse;
-import org.codelibs.fesen.action.update.UpdateRequestBuilder;
-import org.codelibs.fesen.action.update.UpdateResponse;
-import org.codelibs.fesen.common.document.DocumentField;
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.QueryBuilders;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.entity.QueryContext;
 import org.codelibs.fess.entity.SearchRenderData;
@@ -60,6 +51,15 @@ import org.dbflute.optional.OptionalThing;
 import org.dbflute.util.DfTypeUtil;
 import org.lastaflute.taglib.function.LaFunctions;
 import org.lastaflute.web.util.LaRequestUtil;
+import org.opensearch.OpenSearchException;
+import org.opensearch.action.DocWriteResponse.Result;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.bulk.BulkResponse;
+import org.opensearch.action.update.UpdateRequestBuilder;
+import org.opensearch.action.update.UpdateResponse;
+import org.opensearch.common.document.DocumentField;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
 
 public class SearchHelper {
 
@@ -334,7 +334,7 @@ public class SearchHelper {
             builderLambda.accept(builder);
             final UpdateResponse response = builder.execute().actionGet(fessConfig.getIndexIndexTimeout());
             return response.getResult() == Result.CREATED || response.getResult() == Result.UPDATED;
-        } catch (final FesenException e) {
+        } catch (final OpenSearchException e) {
             throw new SearchEngineClientException("Failed to update doc  " + id, e);
         }
     }
diff --git a/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java b/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java
index 19cb106fcef70bc81eb2603fb5321feb6903c0ae..0db22cd64f49d48e3aa57d5eaa715921b44732d3 100644
--- a/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java
@@ -37,8 +37,6 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.concurrent.CommonPoolUtil;
 import org.codelibs.core.lang.StringUtil;
-import org.codelibs.fesen.action.update.UpdateRequest;
-import org.codelibs.fesen.script.Script;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.entity.SearchLogEvent;
 import org.codelibs.fess.entity.SearchRequestParams;
@@ -58,6 +56,8 @@ import org.codelibs.fess.util.QueryResponseList;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.optional.OptionalThing;
 import org.lastaflute.web.util.LaRequestUtil;
+import org.opensearch.action.update.UpdateRequest;
+import org.opensearch.script.Script;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/src/main/java/org/codelibs/fess/helper/SuggestHelper.java b/src/main/java/org/codelibs/fess/helper/SuggestHelper.java
index 742d10830923cb2976c4604734be702284dd488d..5d67b48c0afb43a4456536ee7240f05cf82c1232 100644
--- a/src/main/java/org/codelibs/fess/helper/SuggestHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/SuggestHelper.java
@@ -38,12 +38,6 @@ import org.apache.logging.log4j.Logger;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.lang.ThreadUtil;
 import org.codelibs.core.misc.Pair;
-import org.codelibs.fesen.common.lucene.search.function.CombineFunction;
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.QueryBuilders;
-import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.codelibs.fesen.index.query.functionscore.ScoreFunctionBuilders;
-import org.codelibs.fesen.search.sort.SortBuilders;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.es.config.exbhv.BadWordBhv;
@@ -63,6 +57,12 @@ import org.codelibs.fess.suggest.settings.SuggestSettings;
 import org.codelibs.fess.suggest.settings.SuggestSettingsBuilder;
 import org.codelibs.fess.suggest.util.SuggestUtil;
 import org.codelibs.fess.util.ComponentUtil;
+import org.opensearch.common.lucene.search.function.CombineFunction;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.ScoreFunctionBuilders;
+import org.opensearch.search.sort.SortBuilders;
 
 public class SuggestHelper {
     private static final Logger logger = LogManager.getLogger(SuggestHelper.class);
diff --git a/src/main/java/org/codelibs/fess/helper/SystemHelper.java b/src/main/java/org/codelibs/fess/helper/SystemHelper.java
index a7c1aa78060529abbdd7cf1d07f2113c35fb517d..434e38c4576071dfd981fb849a142e3025446918 100644
--- a/src/main/java/org/codelibs/fess/helper/SystemHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/SystemHelper.java
@@ -61,7 +61,6 @@ import org.codelibs.core.exception.IORuntimeException;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.lang.ThreadUtil;
 import org.codelibs.core.misc.Pair;
-import org.codelibs.fesen.monitor.os.OsProbe;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.crawler.util.CharUtil;
 import org.codelibs.fess.exception.FessSystemException;
@@ -80,6 +79,7 @@ import org.lastaflute.web.ruts.process.ActionRuntime;
 import org.lastaflute.web.servlet.request.RequestManager;
 import org.lastaflute.web.util.LaServletContextUtil;
 import org.lastaflute.web.validation.ActionValidator;
+import org.opensearch.monitor.os.OsProbe;
 
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
diff --git a/src/main/java/org/codelibs/fess/helper/ViewHelper.java b/src/main/java/org/codelibs/fess/helper/ViewHelper.java
index 8f6233367afa63d3115ae270afab947150af3dc8..e5f68c87d34ac772b01833f7861eb85d6aa76a6b 100644
--- a/src/main/java/org/codelibs/fess/helper/ViewHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/ViewHelper.java
@@ -57,8 +57,6 @@ import org.codelibs.core.io.CloseableUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.misc.DynamicProperties;
 import org.codelibs.core.stream.StreamUtil;
-import org.codelibs.fesen.common.text.Text;
-import org.codelibs.fesen.search.fetch.subphase.highlight.HighlightField;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.web.base.SearchForm;
 import org.codelibs.fess.app.web.base.login.FessLoginAssist;
@@ -87,6 +85,8 @@ import org.lastaflute.web.ruts.process.ActionRuntime;
 import org.lastaflute.web.util.LaRequestUtil;
 import org.lastaflute.web.util.LaResponseUtil;
 import org.lastaflute.web.util.LaServletContextUtil;
+import org.opensearch.common.text.Text;
+import org.opensearch.search.fetch.subphase.highlight.HighlightField;
 
 import com.github.jknack.handlebars.Context;
 import com.github.jknack.handlebars.Handlebars;
diff --git a/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java b/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java
index eb1bbdc598a88b7c270a2b9f45c2513a977cb2cf..0b050da2235fb8b3e64d87a50d755cce733fd905 100644
--- a/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java
+++ b/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java
@@ -28,10 +28,6 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.lang.ThreadUtil;
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
-import org.codelibs.fesen.index.query.QueryBuilders;
-import org.codelibs.fesen.search.sort.SortOrder;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.crawler.Crawler;
 import org.codelibs.fess.crawler.entity.AccessResult;
@@ -60,6 +56,10 @@ import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.DocList;
 import org.codelibs.fess.util.MemoryUtil;
 import org.codelibs.fess.util.ThreadDumpUtil;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.search.sort.SortOrder;
 
 public class IndexUpdater extends Thread {
     private static final Logger logger = LogManager.getLogger(IndexUpdater.class);
diff --git a/src/main/java/org/codelibs/fess/job/PurgeDocJob.java b/src/main/java/org/codelibs/fess/job/PurgeDocJob.java
index 633c70a926e2504399cd2b74dcdfb4357ba89717..d3d42745d42805a1e8a965e7b23c1076a84f7167 100644
--- a/src/main/java/org/codelibs/fess/job/PurgeDocJob.java
+++ b/src/main/java/org/codelibs/fess/job/PurgeDocJob.java
@@ -17,11 +17,11 @@ package org.codelibs.fess.job;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.codelibs.fesen.index.query.QueryBuilder;
-import org.codelibs.fesen.index.query.QueryBuilders;
 import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.util.ComponentUtil;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
 
 public class PurgeDocJob {
 
diff --git a/src/main/java/org/codelibs/fess/job/UpdateLabelJob.java b/src/main/java/org/codelibs/fess/job/UpdateLabelJob.java
index 4e39c6fe4b07627d2d100732d2f2ed8a24ad4f60..c4b717dc7c5443639702a4b194c3eb04eac5c140 100644
--- a/src/main/java/org/codelibs/fess/job/UpdateLabelJob.java
+++ b/src/main/java/org/codelibs/fess/job/UpdateLabelJob.java
@@ -22,14 +22,14 @@ import java.util.stream.Collectors;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.lang.StringUtil;
-import org.codelibs.fesen.index.query.QueryBuilder;
-import org.codelibs.fesen.script.Script;
 import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.helper.LabelTypeHelper;
 import org.codelibs.fess.helper.LanguageHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.DocumentUtil;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.script.Script;
 
 public class UpdateLabelJob {
 
diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
index 360df1c53e27bf85690932eb0ebafa7ea1f518a0..cb7345bd3d296eb85e855c7ad8318bb0a75a279c 100644
--- a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
+++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
@@ -1745,7 +1745,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     /**
      * Get the value for the key 'elasticsearch.type'. <br>
      * The value is, e.g. default <br>
-     * comment: Fesen
+     * comment: OpenSearch
      * @return The value of found property. (NotNull: if not found, exception but basically no way)
      */
     String getFesenType();
@@ -1755,7 +1755,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
      * The value is, e.g. http://localhost:9201 <br>
      * @return The value of found property. (NotNull: if not found, exception but basically no way)
      */
-    String getFesenHttpUrl();
+    String getOpenSearchHttpUrl();
 
     /**
      * Get the value for the key 'elasticsearch.username'. <br>
@@ -7210,7 +7210,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
             return get(FessConfig.ELASTICSEARCH_TYPE);
         }
 
-        public String getFesenHttpUrl() {
+        public String getOpenSearchHttpUrl() {
             return get(FessConfig.ELASTICSEARCH_HTTP_URL);
         }
 
diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java b/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java
index 90bf5ea3c5d90c9daf7f28e8ed386682560da076..0ceff08c7159666551b23bc86dd603f100d02a7a 100644
--- a/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java
+++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java
@@ -48,9 +48,6 @@ import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.misc.Pair;
 import org.codelibs.core.misc.Tuple3;
 import org.codelibs.core.misc.Tuple4;
-import org.codelibs.fesen.search.sort.SortBuilder;
-import org.codelibs.fesen.search.sort.SortBuilders;
-import org.codelibs.fesen.search.sort.SortOrder;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.helper.PermissionHelper;
 import org.codelibs.fess.mylasta.action.FessUserBean;
@@ -67,6 +64,9 @@ import org.lastaflute.web.validation.theme.typed.DoubleTypeValidator;
 import org.lastaflute.web.validation.theme.typed.FloatTypeValidator;
 import org.lastaflute.web.validation.theme.typed.IntegerTypeValidator;
 import org.lastaflute.web.validation.theme.typed.LongTypeValidator;
+import org.opensearch.search.sort.SortBuilder;
+import org.opensearch.search.sort.SortBuilders;
+import org.opensearch.search.sort.SortOrder;
 
 public interface FessProp {
 
diff --git a/src/main/java/org/codelibs/fess/score/LtrQueryRescorer.java b/src/main/java/org/codelibs/fess/score/LtrQueryRescorer.java
index 631da12ef065394d44120fb4c3f4a4391de4522e..c11d0f3a3f9016f326bd37038d9fd6c86d7dd028 100644
--- a/src/main/java/org/codelibs/fess/score/LtrQueryRescorer.java
+++ b/src/main/java/org/codelibs/fess/score/LtrQueryRescorer.java
@@ -18,11 +18,11 @@ package org.codelibs.fess.score;
 import java.util.Map;
 
 import org.codelibs.core.lang.StringUtil;
-import org.codelibs.fesen.search.rescore.QueryRescorerBuilder;
-import org.codelibs.fesen.search.rescore.RescorerBuilder;
 import org.codelibs.fess.es.query.StoredLtrQueryBuilder;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.util.ComponentUtil;
+import org.opensearch.search.rescore.QueryRescorerBuilder;
+import org.opensearch.search.rescore.RescorerBuilder;
 
 public class LtrQueryRescorer implements QueryRescorer {
 
diff --git a/src/main/java/org/codelibs/fess/score/QueryRescorer.java b/src/main/java/org/codelibs/fess/score/QueryRescorer.java
index fce8b45bdc1d8460f1d4d535dc4e69a1803773d0..7bf0c3e4cc95c9306470cf8bc2798ce0a0d820fa 100644
--- a/src/main/java/org/codelibs/fess/score/QueryRescorer.java
+++ b/src/main/java/org/codelibs/fess/score/QueryRescorer.java
@@ -17,7 +17,7 @@ package org.codelibs.fess.score;
 
 import java.util.Map;
 
-import org.codelibs.fesen.search.rescore.RescorerBuilder;
+import org.opensearch.search.rescore.RescorerBuilder;
 
 public interface QueryRescorer {
     RescorerBuilder<?> evaluate(final Map<String, Object> params);
diff --git a/src/main/java/org/codelibs/fess/score/ScoreBooster.java b/src/main/java/org/codelibs/fess/score/ScoreBooster.java
index d3134b11bed47e155fedd58b79c0e5b14a26cdfb..6996f9ce3b394e0a8c724b321fb70974e681ab9c 100644
--- a/src/main/java/org/codelibs/fess/score/ScoreBooster.java
+++ b/src/main/java/org/codelibs/fess/score/ScoreBooster.java
@@ -22,17 +22,17 @@ import java.util.function.Function;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.lang.StringUtil;
-import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
-import org.codelibs.fesen.action.bulk.BulkResponse;
-import org.codelibs.fesen.action.search.SearchResponse;
-import org.codelibs.fesen.action.update.UpdateRequestBuilder;
-import org.codelibs.fesen.index.query.QueryBuilders;
-import org.codelibs.fesen.script.Script;
-import org.codelibs.fesen.script.ScriptType;
-import org.codelibs.fesen.search.SearchHit;
 import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.util.ComponentUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.bulk.BulkResponse;
+import org.opensearch.action.search.SearchResponse;
+import org.opensearch.action.update.UpdateRequestBuilder;
+import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.script.Script;
+import org.opensearch.script.ScriptType;
+import org.opensearch.search.SearchHit;
 
 public abstract class ScoreBooster {
     private static final Logger logger = LogManager.getLogger(ScoreBooster.class);
diff --git a/src/main/java/org/codelibs/fess/sso/aad/AzureAdAuthenticator.java b/src/main/java/org/codelibs/fess/sso/aad/AzureAdAuthenticator.java
index 578630a0b8853e1a40646c752a20f41b3323cb79..446b9462b5eea4fa49b252f8346bce7a489992ee 100644
--- a/src/main/java/org/codelibs/fess/sso/aad/AzureAdAuthenticator.java
+++ b/src/main/java/org/codelibs/fess/sso/aad/AzureAdAuthenticator.java
@@ -47,7 +47,6 @@ import org.codelibs.core.net.UuidUtil;
 import org.codelibs.core.stream.StreamUtil;
 import org.codelibs.curl.Curl;
 import org.codelibs.curl.CurlResponse;
-import org.codelibs.fesen.runner.net.FesenCurl;
 import org.codelibs.fess.app.web.base.login.ActionResponseCredential;
 import org.codelibs.fess.app.web.base.login.AzureAdCredential;
 import org.codelibs.fess.app.web.base.login.AzureAdCredential.AzureAdUser;
@@ -60,6 +59,7 @@ import org.codelibs.fess.sso.SsoAuthenticator;
 import org.codelibs.fess.sso.SsoResponseType;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.DocumentUtil;
+import org.codelibs.opensearch.runner.net.OpenSearchCurl;
 import org.dbflute.optional.OptionalEntity;
 import org.lastaflute.web.login.credential.LoginCredential;
 import org.lastaflute.web.response.ActionResponse;
@@ -369,7 +369,7 @@ public class AzureAdAuthenticator implements SsoAuthenticator {
         }
         try (CurlResponse response = Curl.get(url).header("Authorization", "Bearer " + user.getAuthenticationResult().getAccessToken())
                 .header("Accept", "application/json").execute()) {
-            final Map<String, Object> contentMap = response.getContent(FesenCurl.jsonParser());
+            final Map<String, Object> contentMap = response.getContent(OpenSearchCurl.jsonParser());
             if (logger.isDebugEnabled()) {
                 logger.debug("response: {}", contentMap);
             }
@@ -453,7 +453,7 @@ public class AzureAdAuthenticator implements SsoAuthenticator {
                         Curl.post(url).header("Authorization", "Bearer " + user.getAuthenticationResult().getAccessToken())
                                 .header("Accept", "application/json").header("Content-type", "application/json")
                                 .body("{\"securityEnabledOnly\":false}").execute()) {
-                    final Map<String, Object> contentMap = response.getContent(FesenCurl.jsonParser());
+                    final Map<String, Object> contentMap = response.getContent(OpenSearchCurl.jsonParser());
                     if (logger.isDebugEnabled()) {
                         logger.debug("response: {}", contentMap);
                     }
@@ -497,7 +497,7 @@ public class AzureAdAuthenticator implements SsoAuthenticator {
         }
         try (CurlResponse response = Curl.get(url).header("Authorization", "Bearer " + user.getAuthenticationResult().getAccessToken())
                 .header("Accept", "application/json").execute()) {
-            final Map<String, Object> contentMap = response.getContent(FesenCurl.jsonParser());
+            final Map<String, Object> contentMap = response.getContent(OpenSearchCurl.jsonParser());
             if (logger.isDebugEnabled()) {
                 logger.debug("response: {}", contentMap);
             }
diff --git a/src/main/java/org/codelibs/fess/taglib/FessFunctions.java b/src/main/java/org/codelibs/fess/taglib/FessFunctions.java
index 94336ac3fc0b7fe84f80b8005a63aac61c2d08f8..82952ead9f613aac5c523c738eba0837a309b45f 100644
--- a/src/main/java/org/codelibs/fess/taglib/FessFunctions.java
+++ b/src/main/java/org/codelibs/fess/taglib/FessFunctions.java
@@ -51,7 +51,6 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.pdfbox.util.DateConverter;
 import org.codelibs.core.lang.StringUtil;
-import org.codelibs.fesen.common.joda.Joda;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.app.web.base.login.FessLoginAssist;
@@ -62,6 +61,7 @@ import org.lastaflute.di.util.LdiURLUtil;
 import org.lastaflute.web.util.LaRequestUtil;
 import org.lastaflute.web.util.LaResponseUtil;
 import org.lastaflute.web.util.LaServletContextUtil;
+import org.opensearch.common.joda.Joda;
 
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
diff --git a/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java b/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java
index eacadca1148bfeb63722f30a8681c2fe98ba0371..c3abcb059236e3072233af19388bba69b9d03216 100644
--- a/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java
+++ b/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java
@@ -41,7 +41,6 @@ import org.apache.logging.log4j.Logger;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.lang.ThreadUtil;
 import org.codelibs.core.misc.Tuple3;
-import org.codelibs.fesen.index.query.QueryBuilders;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.es.config.exbhv.ThumbnailQueueBhv;
@@ -53,6 +52,7 @@ import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.DocumentUtil;
 import org.codelibs.fess.util.ResourceUtil;
+import org.opensearch.index.query.QueryBuilders;
 
 import com.google.common.collect.Lists;
 
diff --git a/src/main/java/org/codelibs/fess/timer/SystemMonitorTarget.java b/src/main/java/org/codelibs/fess/timer/SystemMonitorTarget.java
index 8c4aaf548ed78b20aab260b34d271f11d6c58518..cc2de9bbce7d8bdfa25a331e4b767022fa60f900 100644
--- a/src/main/java/org/codelibs/fess/timer/SystemMonitorTarget.java
+++ b/src/main/java/org/codelibs/fess/timer/SystemMonitorTarget.java
@@ -26,22 +26,22 @@ import org.apache.commons.text.StringEscapeUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.timer.TimeoutTarget;
-import org.codelibs.fesen.action.admin.cluster.node.stats.NodesStatsResponse;
-import org.codelibs.fesen.common.xcontent.ToXContent;
-import org.codelibs.fesen.common.xcontent.XContentBuilder;
-import org.codelibs.fesen.common.xcontent.XContentFactory;
-import org.codelibs.fesen.monitor.jvm.JvmStats;
-import org.codelibs.fesen.monitor.jvm.JvmStats.BufferPool;
-import org.codelibs.fesen.monitor.jvm.JvmStats.Classes;
-import org.codelibs.fesen.monitor.jvm.JvmStats.GarbageCollectors;
-import org.codelibs.fesen.monitor.jvm.JvmStats.Mem;
-import org.codelibs.fesen.monitor.jvm.JvmStats.Threads;
-import org.codelibs.fesen.monitor.os.OsProbe;
-import org.codelibs.fesen.monitor.os.OsStats;
-import org.codelibs.fesen.monitor.process.ProcessProbe;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.util.ComponentUtil;
+import org.opensearch.action.admin.cluster.node.stats.NodesStatsResponse;
+import org.opensearch.common.xcontent.ToXContent;
+import org.opensearch.common.xcontent.XContentBuilder;
+import org.opensearch.common.xcontent.XContentFactory;
+import org.opensearch.monitor.jvm.JvmStats;
+import org.opensearch.monitor.jvm.JvmStats.BufferPool;
+import org.opensearch.monitor.jvm.JvmStats.Classes;
+import org.opensearch.monitor.jvm.JvmStats.GarbageCollectors;
+import org.opensearch.monitor.jvm.JvmStats.Mem;
+import org.opensearch.monitor.jvm.JvmStats.Threads;
+import org.opensearch.monitor.os.OsProbe;
+import org.opensearch.monitor.os.OsStats;
+import org.opensearch.monitor.process.ProcessProbe;
 
 public class SystemMonitorTarget implements TimeoutTarget {
     private static final Logger logger = LogManager.getLogger(SystemMonitorTarget.class);
diff --git a/src/main/java/org/codelibs/fess/util/FacetResponse.java b/src/main/java/org/codelibs/fess/util/FacetResponse.java
index b52c20006fec92f31338d4b640c629b7c03a1781..76954b80ba2825f5b81e30d78966524ed0035937 100644
--- a/src/main/java/org/codelibs/fess/util/FacetResponse.java
+++ b/src/main/java/org/codelibs/fess/util/FacetResponse.java
@@ -21,10 +21,10 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fesen.search.aggregations.Aggregations;
-import org.codelibs.fesen.search.aggregations.bucket.filter.Filter;
-import org.codelibs.fesen.search.aggregations.bucket.terms.Terms;
 import org.codelibs.fess.Constants;
+import org.opensearch.search.aggregations.Aggregations;
+import org.opensearch.search.aggregations.bucket.filter.Filter;
+import org.opensearch.search.aggregations.bucket.terms.Terms;
 
 import com.google.common.io.BaseEncoding;
 
diff --git a/src/main/java/org/codelibs/fess/util/QueryResponseList.java b/src/main/java/org/codelibs/fess/util/QueryResponseList.java
index 27c4c8aa6407901a9571a18eaa4e630cf816cf1e..4fca081c503a0c1d7d7059f0aa6c4cb930268bce 100644
--- a/src/main/java/org/codelibs/fess/util/QueryResponseList.java
+++ b/src/main/java/org/codelibs/fess/util/QueryResponseList.java
@@ -26,17 +26,17 @@ import java.util.Map;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.stream.StreamUtil;
-import org.codelibs.fesen.action.search.SearchResponse;
-import org.codelibs.fesen.common.document.DocumentField;
-import org.codelibs.fesen.search.SearchHit;
-import org.codelibs.fesen.search.SearchHits;
-import org.codelibs.fesen.search.aggregations.Aggregations;
-import org.codelibs.fesen.search.fetch.subphase.highlight.HighlightField;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.helper.QueryHelper;
 import org.codelibs.fess.helper.ViewHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.dbflute.optional.OptionalEntity;
+import org.opensearch.action.search.SearchResponse;
+import org.opensearch.common.document.DocumentField;
+import org.opensearch.search.SearchHit;
+import org.opensearch.search.SearchHits;
+import org.opensearch.search.aggregations.Aggregations;
+import org.opensearch.search.fetch.subphase.highlight.HighlightField;
 
 public class QueryResponseList implements List<Map<String, Object>> {
 
diff --git a/src/main/java/org/codelibs/fess/util/ResourceUtil.java b/src/main/java/org/codelibs/fess/util/ResourceUtil.java
index ea63e12a4f94f7e7f8875ea63300d12cca17f012..d36b5afb95dd3f813e77db24882c6bc8f260d47d 100644
--- a/src/main/java/org/codelibs/fess/util/ResourceUtil.java
+++ b/src/main/java/org/codelibs/fess/util/ResourceUtil.java
@@ -48,7 +48,7 @@ public class ResourceUtil {
             return url;
         }
         final FessConfig fessConfig = ComponentUtil.getFessConfig();
-        return fessConfig.getFesenHttpUrl();
+        return fessConfig.getOpenSearchHttpUrl();
     }
 
     public static String getAppType() {
diff --git a/src/main/java/org/codelibs/fess/util/SearchEngineUtil.java b/src/main/java/org/codelibs/fess/util/SearchEngineUtil.java
index 2d21e8fee404eeb4694aa699e8b484b7bd777d5b..194848610302f593bc9fcaa9f40bbf6718c5f7bf 100644
--- a/src/main/java/org/codelibs/fess/util/SearchEngineUtil.java
+++ b/src/main/java/org/codelibs/fess/util/SearchEngineUtil.java
@@ -22,12 +22,12 @@ import java.util.function.Function;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.codelibs.fesen.common.xcontent.ToXContent;
-import org.codelibs.fesen.common.xcontent.XContentBuilder;
-import org.codelibs.fesen.common.xcontent.XContentFactory;
-import org.codelibs.fesen.common.xcontent.XContentType;
-import org.codelibs.fesen.search.SearchHit;
 import org.codelibs.fess.es.client.SearchEngineClient;
+import org.opensearch.common.xcontent.ToXContent;
+import org.opensearch.common.xcontent.XContentBuilder;
+import org.opensearch.common.xcontent.XContentFactory;
+import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.search.SearchHit;
 
 public final class SearchEngineUtil {
 
diff --git a/src/main/java/org/codelibs/fess/util/UpgradeUtil.java b/src/main/java/org/codelibs/fess/util/UpgradeUtil.java
index c8755086875224f54abb0741bb2effaca12b02d5..11d28ffecaf43e52daef9fe5310a599987f60f2c 100644
--- a/src/main/java/org/codelibs/fess/util/UpgradeUtil.java
+++ b/src/main/java/org/codelibs/fess/util/UpgradeUtil.java
@@ -23,20 +23,20 @@ import org.apache.logging.log4j.Logger;
 import org.codelibs.core.exception.ResourceNotFoundRuntimeException;
 import org.codelibs.core.io.FileUtil;
 import org.codelibs.curl.CurlResponse;
-import org.codelibs.fesen.action.ActionListener;
-import org.codelibs.fesen.action.admin.indices.exists.indices.IndicesExistsResponse;
-import org.codelibs.fesen.action.admin.indices.mapping.get.GetFieldMappingsResponse;
-import org.codelibs.fesen.action.admin.indices.mapping.get.GetFieldMappingsResponse.FieldMappingMetadata;
-import org.codelibs.fesen.action.admin.indices.mapping.get.GetMappingsResponse;
-import org.codelibs.fesen.action.admin.indices.mapping.put.PutMappingRequestBuilder;
-import org.codelibs.fesen.action.index.IndexRequest;
-import org.codelibs.fesen.action.support.master.AcknowledgedResponse;
-import org.codelibs.fesen.client.Client;
-import org.codelibs.fesen.client.IndicesAdminClient;
-import org.codelibs.fesen.cluster.metadata.MappingMetadata;
-import org.codelibs.fesen.common.collect.ImmutableOpenMap;
-import org.codelibs.fesen.common.xcontent.XContentType;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.opensearch.action.ActionListener;
+import org.opensearch.action.admin.indices.exists.indices.IndicesExistsResponse;
+import org.opensearch.action.admin.indices.mapping.get.GetFieldMappingsResponse;
+import org.opensearch.action.admin.indices.mapping.get.GetFieldMappingsResponse.FieldMappingMetadata;
+import org.opensearch.action.admin.indices.mapping.get.GetMappingsResponse;
+import org.opensearch.action.admin.indices.mapping.put.PutMappingRequestBuilder;
+import org.opensearch.action.index.IndexRequest;
+import org.opensearch.action.support.master.AcknowledgedResponse;
+import org.opensearch.client.Client;
+import org.opensearch.client.IndicesAdminClient;
+import org.opensearch.cluster.metadata.MappingMetadata;
+import org.opensearch.common.collect.ImmutableOpenMap;
+import org.opensearch.common.xcontent.XContentType;
 
 public final class UpgradeUtil {
     private static final Logger logger = LogManager.getLogger(UpgradeUtil.class);
diff --git a/src/test/java/org/codelibs/fess/helper/QueryHelperTest.java b/src/test/java/org/codelibs/fess/helper/QueryHelperTest.java
index 1b19e226e4a9129b4b425658c74f5859d7d4a164..db51f0848327daba1c92752efb8256b7894b34e0 100644
--- a/src/test/java/org/codelibs/fess/helper/QueryHelperTest.java
+++ b/src/test/java/org/codelibs/fess/helper/QueryHelperTest.java
@@ -22,16 +22,16 @@ import org.apache.lucene.queryparser.classic.QueryParser;
 import org.apache.lucene.queryparser.ext.ExtendableQueryParser;
 import org.codelibs.core.io.FileUtil;
 import org.codelibs.core.misc.DynamicProperties;
-import org.codelibs.fesen.index.query.BoolQueryBuilder;
-import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
-import org.codelibs.fesen.index.query.PrefixQueryBuilder;
-import org.codelibs.fesen.index.query.QueryBuilder;
-import org.codelibs.fesen.index.query.QueryBuilders;
-import org.codelibs.fesen.index.query.functionscore.ScoreFunctionBuilders;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.entity.SearchRequestParams.SearchRequestType;
 import org.codelibs.fess.unit.UnitFessTestCase;
 import org.codelibs.fess.util.ComponentUtil;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.index.query.functionscore.ScoreFunctionBuilders;
 
 public class QueryHelperTest extends UnitFessTestCase {