diff --git a/docs/custom-error-pages.adoc b/docs/custom-error-pages.adoc
index 68daf27d..fa531e26 100644
--- a/docs/custom-error-pages.adoc
+++ b/docs/custom-error-pages.adoc
@@ -41,13 +41,13 @@ spring:
   cloud:
     gateway:
       default-filters:
-        - ServiceError
+        - ApplicationError
 ----
 
 To enable it only on some routes, add this to concerned routes in routes.yaml :
 [routes.yaml]
 ----
         filters:
-        - name: ServiceError
+        - name: ApplicationError
 ----
 
diff --git a/gateway/src/main/java/org/georchestra/gateway/autoconfigure/app/FiltersAutoConfiguration.java b/gateway/src/main/java/org/georchestra/gateway/autoconfigure/app/FiltersAutoConfiguration.java
index 1bb03e5e..9cc460e3 100644
--- a/gateway/src/main/java/org/georchestra/gateway/autoconfigure/app/FiltersAutoConfiguration.java
+++ b/gateway/src/main/java/org/georchestra/gateway/autoconfigure/app/FiltersAutoConfiguration.java
@@ -20,7 +20,7 @@
 
 import org.georchestra.gateway.filter.global.ResolveTargetGlobalFilter;
 import org.georchestra.gateway.filter.headers.HeaderFiltersConfiguration;
-import org.georchestra.gateway.filter.global.ServiceErrorGatewayFilterFactory;
+import org.georchestra.gateway.filter.global.ApplicationErrorGatewayFilterFactory;
 import org.georchestra.gateway.model.GatewayConfigProperties;
 import org.georchestra.gateway.model.GeorchestraTargetConfig;
 import org.geoserver.cloud.gateway.filter.RouteProfileGatewayFilterFactory;
@@ -66,7 +66,7 @@ public class FiltersAutoConfiguration {
         return new StripBasePathGatewayFilterFactory();
     }
 
-    public @Bean ServiceErrorGatewayFilterFactory serviceErrorGatewayFilterFactory() {
-        return new ServiceErrorGatewayFilterFactory();
+    public @Bean ApplicationErrorGatewayFilterFactory applicationErrorGatewayFilterFactory() {
+        return new ApplicationErrorGatewayFilterFactory();
     }
 }
diff --git a/gateway/src/main/java/org/georchestra/gateway/filter/global/ServiceErrorGatewayFilterFactory.java b/gateway/src/main/java/org/georchestra/gateway/filter/global/ApplicationErrorGatewayFilterFactory.java
similarity index 89%
rename from gateway/src/main/java/org/georchestra/gateway/filter/global/ServiceErrorGatewayFilterFactory.java
rename to gateway/src/main/java/org/georchestra/gateway/filter/global/ApplicationErrorGatewayFilterFactory.java
index 6441a407..356c7177 100644
--- a/gateway/src/main/java/org/georchestra/gateway/filter/global/ServiceErrorGatewayFilterFactory.java
+++ b/gateway/src/main/java/org/georchestra/gateway/filter/global/ApplicationErrorGatewayFilterFactory.java
@@ -9,8 +9,8 @@
 import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Mono;
 
-public class ServiceErrorGatewayFilterFactory extends AbstractGatewayFilterFactory<Object> {
-    public ServiceErrorGatewayFilterFactory() {
+public class ApplicationErrorGatewayFilterFactory extends AbstractGatewayFilterFactory<Object> {
+    public ApplicationErrorGatewayFilterFactory() {
         super(Object.class);
     }