diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/CatalogApplication.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/CatalogApplication.java
index be7a57a0eef..00b0b52a6fc 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/CatalogApplication.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/CatalogApplication.java
@@ -49,8 +49,8 @@ import org.openmetadata.catalog.resources.CollectionRegistry;
 import org.openmetadata.catalog.resources.config.ConfigResource;
 import org.openmetadata.catalog.resources.search.SearchResource;
 import org.openmetadata.catalog.security.AuthenticationConfiguration;
+import org.openmetadata.catalog.security.Authorizer;
 import org.openmetadata.catalog.security.AuthorizerConfiguration;
-import org.openmetadata.catalog.security.CatalogAuthorizer;
 import org.openmetadata.catalog.security.NoopAuthorizer;
 import org.openmetadata.catalog.security.NoopFilter;
 import org.openmetadata.catalog.security.auth.CatalogSecurityContextRequestFilter;
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
 public class CatalogApplication extends Application<CatalogApplicationConfig> {
   public static final Logger LOG = LoggerFactory.getLogger(CatalogApplication.class);
   private Injector injector;
-  private CatalogAuthorizer authorizer;
+  private Authorizer authorizer;
 
   public CatalogApplication() {}
 
@@ -138,8 +138,7 @@ public class CatalogApplication extends Application<CatalogApplicationConfig> {
     AuthorizerConfiguration authorizerConf = catalogConfig.getAuthorizerConfiguration();
     AuthenticationConfiguration authenticationConfiguration = catalogConfig.getAuthenticationConfiguration();
     if (authorizerConf != null) {
-      authorizer =
-          ((Class<CatalogAuthorizer>) Class.forName(authorizerConf.getClassName())).getConstructor().newInstance();
+      authorizer = ((Class<Authorizer>) Class.forName(authorizerConf.getClassName())).getConstructor().newInstance();
       authorizer.init(authorizerConf, jdbi);
       String filterClazzName = authorizerConf.getContainerRequestFilter();
       ContainerRequestFilter filter;
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/module/CatalogModule.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/module/CatalogModule.java
index 1fbb9aeec7f..c5691e2862d 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/module/CatalogModule.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/module/CatalogModule.java
@@ -15,18 +15,18 @@ package org.openmetadata.catalog.module;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
-import org.openmetadata.catalog.security.CatalogAuthorizer;
+import org.openmetadata.catalog.security.Authorizer;
 
 public class CatalogModule extends AbstractModule {
-  private final CatalogAuthorizer authorizer;
+  private final Authorizer authorizer;
 
-  public CatalogModule(CatalogAuthorizer authorizer) {
+  public CatalogModule(Authorizer authorizer) {
     this.authorizer = authorizer;
   }
 
   // Authorizer
   @Provides
-  public CatalogAuthorizer providesAuthorizer() {
+  public Authorizer providesAuthorizer() {
     return authorizer;
   }
 
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/CollectionRegistry.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/CollectionRegistry.java
index a621f0546f4..aac16eaa216 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/CollectionRegistry.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/CollectionRegistry.java
@@ -32,7 +32,7 @@ import javax.ws.rs.core.UriInfo;
 import org.jdbi.v3.core.Jdbi;
 import org.openmetadata.catalog.CatalogApplicationConfig;
 import org.openmetadata.catalog.jdbi3.CollectionDAO;
-import org.openmetadata.catalog.security.CatalogAuthorizer;
+import org.openmetadata.catalog.security.Authorizer;
 import org.openmetadata.catalog.type.CollectionDescriptor;
 import org.openmetadata.catalog.type.CollectionInfo;
 import org.openmetadata.catalog.util.RestUtil;
@@ -118,7 +118,7 @@ public final class CollectionRegistry {
 
   /** Register resources from CollectionRegistry */
   public void registerResources(
-      Jdbi jdbi, Environment environment, CatalogApplicationConfig config, CatalogAuthorizer authorizer) {
+      Jdbi jdbi, Environment environment, CatalogApplicationConfig config, Authorizer authorizer) {
     // Build list of ResourceDescriptors
     for (Map.Entry<String, CollectionDetails> e : collectionMap.entrySet()) {
       CollectionDetails details = e.getValue();
@@ -181,7 +181,7 @@ public final class CollectionRegistry {
 
   /** Create a resource class based on dependencies declared in @Collection annotation */
   private static Object createResource(
-      CollectionDAO daoObject, String resourceClass, CatalogApplicationConfig config, CatalogAuthorizer authorizer)
+      CollectionDAO daoObject, String resourceClass, CatalogApplicationConfig config, Authorizer authorizer)
       throws ClassNotFoundException, NoSuchMethodException, IllegalAccessException, InvocationTargetException,
           InstantiationException {
     Object resource;
@@ -189,8 +189,7 @@ public final class CollectionRegistry {
 
     // Create the resource identified by resourceClass
     try {
-      resource =
-          clz.getDeclaredConstructor(CollectionDAO.class, CatalogAuthorizer.class).newInstance(daoObject, authorizer);
+      resource = clz.getDeclaredConstructor(CollectionDAO.class, Authorizer.class).newInstance(daoObject, authorizer);
     } catch (NoSuchMethodException ex) {
       resource = Class.forName(resourceClass).getConstructor().newInstance();
     }
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/bots/BotsResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/bots/BotsResource.java
index 26c120bcdb7..266e06c909f 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/bots/BotsResource.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/bots/BotsResource.java
@@ -45,7 +45,7 @@ import org.openmetadata.catalog.entity.Bots;
 import org.openmetadata.catalog.jdbi3.BotsRepository;
 import org.openmetadata.catalog.jdbi3.CollectionDAO;
 import org.openmetadata.catalog.resources.Collection;
-import org.openmetadata.catalog.security.CatalogAuthorizer;
+import org.openmetadata.catalog.security.Authorizer;
 import org.openmetadata.catalog.security.SecurityUtil;
 import org.openmetadata.catalog.util.EntityUtil.Fields;
 import org.openmetadata.catalog.util.RestUtil;
@@ -59,10 +59,10 @@ import org.openmetadata.catalog.util.ResultList;
 public class BotsResource {
   public static final String COLLECTION_PATH = "/v1/bots/";
   private final BotsRepository dao;
-  private final CatalogAuthorizer authorizer;
+  private final Authorizer authorizer;
 
   @Inject
-  public BotsResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
+  public BotsResource(CollectionDAO dao, Authorizer authorizer) {
     this.dao = new BotsRepository(dao);
     this.authorizer = authorizer;
   }
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/charts/ChartResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/charts/ChartResource.java
index 6e97a994e39..f7512119f10 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/charts/ChartResource.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/charts/ChartResource.java
@@ -60,7 +60,7 @@ import org.openmetadata.catalog.jdbi3.ChartRepository;
 import org.openmetadata.catalog.jdbi3.ChartRepository.ChartEntityInterface;
 import org.openmetadata.catalog.jdbi3.CollectionDAO;
 import org.openmetadata.catalog.resources.Collection;
-import org.openmetadata.catalog.security.CatalogAuthorizer;
+import org.openmetadata.catalog.security.Authorizer;
 import org.openmetadata.catalog.security.SecurityUtil;
 import org.openmetadata.catalog.type.EntityHistory;
 import org.openmetadata.catalog.util.EntityUtil.Fields;
@@ -77,7 +77,7 @@ import org.openmetadata.catalog.util.ResultList;
 public class ChartResource {
   public static final String COLLECTION_PATH = "v1/charts/";
   private final ChartRepository dao;
-  private final CatalogAuthorizer authorizer;
+  private final Authorizer authorizer;
 
   public static ResultList<Chart> addHref(UriInfo uriInfo, ResultList<Chart> charts) {
     Optional.ofNullable(charts.getData()).orElse(Collections.emptyList()).forEach(i -> addHref(uriInfo, i));
@@ -93,7 +93,7 @@ public class ChartResource {
   }
 
   @Inject
-  public ChartResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
+  public ChartResource(CollectionDAO dao, Authorizer authorizer) {
     this.dao = new ChartRepository(dao);
     this.authorizer = authorizer;
   }
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/dashboards/DashboardResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/dashboards/DashboardResource.java
index b1d7417ab47..5abd07e861b 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/dashboards/DashboardResource.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/dashboards/DashboardResource.java
@@ -60,7 +60,7 @@ import org.openmetadata.catalog.entity.data.Dashboard;
 import org.openmetadata.catalog.jdbi3.CollectionDAO;
 import org.openmetadata.catalog.jdbi3.DashboardRepository;
 import org.openmetadata.catalog.resources.Collection;
-import org.openmetadata.catalog.security.CatalogAuthorizer;
+import org.openmetadata.catalog.security.Authorizer;
 import org.openmetadata.catalog.security.SecurityUtil;
 import org.openmetadata.catalog.type.EntityHistory;
 import org.openmetadata.catalog.util.EntityUtil.Fields;
@@ -77,7 +77,7 @@ import org.openmetadata.catalog.util.ResultList;
 public class DashboardResource {
   public static final String COLLECTION_PATH = "v1/dashboards/";
   private final DashboardRepository dao;
-  private final CatalogAuthorizer authorizer;
+  private final Authorizer authorizer;
 
   public static ResultList<Dashboard> addHref(UriInfo uriInfo, ResultList<Dashboard> dashboards) {
     Optional.ofNullable(dashboards.getData()).orElse(Collections.emptyList()).forEach(i -> addHref(uriInfo, i));
@@ -93,7 +93,7 @@ public class DashboardResource {
   }
 
   @Inject
-  public DashboardResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
+  public DashboardResource(CollectionDAO dao, Authorizer authorizer) {
     Objects.requireNonNull(dao, "DashboardRepository must not be null");
     this.dao = new DashboardRepository(dao);
     this.authorizer = authorizer;
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/databases/DatabaseResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/databases/DatabaseResource.java
index f32cfc01941..dff1acc84c7 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/databases/DatabaseResource.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/databases/DatabaseResource.java
@@ -60,7 +60,7 @@ import org.openmetadata.catalog.jdbi3.CollectionDAO;
 import org.openmetadata.catalog.jdbi3.DatabaseRepository;
 import org.openmetadata.catalog.jdbi3.DatabaseRepository.DatabaseEntityInterface;
 import org.openmetadata.catalog.resources.Collection;
-import org.openmetadata.catalog.security.CatalogAuthorizer;
+import org.openmetadata.catalog.security.Authorizer;
 import org.openmetadata.catalog.security.SecurityUtil;
 import org.openmetadata.catalog.type.EntityHistory;
 import org.openmetadata.catalog.type.EntityReference;
@@ -78,7 +78,7 @@ import org.openmetadata.catalog.util.ResultList;
 public class DatabaseResource {
   public static final String COLLECTION_PATH = "v1/databases/";
   private final DatabaseRepository dao;
-  private final CatalogAuthorizer authorizer;
+  private final Authorizer authorizer;
 
   public static ResultList<Database> addHref(UriInfo uriInfo, ResultList<Database> databases) {
     Optional.ofNullable(databases.getData())
@@ -104,7 +104,7 @@ public class DatabaseResource {
   }
 
   @Inject
-  public DatabaseResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
+  public DatabaseResource(CollectionDAO dao, Authorizer authorizer) {
     this.dao = new DatabaseRepository(dao);
     this.authorizer = authorizer;
   }
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/databases/TableResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/databases/TableResource.java
index 657b65cfaae..5473e088c97 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/databases/TableResource.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/databases/TableResource.java
@@ -57,7 +57,7 @@ import org.openmetadata.catalog.entity.data.Table;
 import org.openmetadata.catalog.jdbi3.CollectionDAO;
 import org.openmetadata.catalog.jdbi3.TableRepository;
 import org.openmetadata.catalog.resources.Collection;
-import org.openmetadata.catalog.security.CatalogAuthorizer;
+import org.openmetadata.catalog.security.Authorizer;
 import org.openmetadata.catalog.security.SecurityUtil;
 import org.openmetadata.catalog.type.DataModel;
 import org.openmetadata.catalog.type.EntityHistory;
@@ -80,7 +80,7 @@ import org.openmetadata.catalog.util.ResultList;
 public class TableResource {
   public static final String COLLECTION_PATH = "v1/tables/";
   private final TableRepository dao;
-  private final CatalogAuthorizer authorizer;
+  private final Authorizer authorizer;
 
   public static Table addHref(UriInfo uriInfo, Table table) {
     Entity.withHref(uriInfo, table.getDatabase());
@@ -91,7 +91,7 @@ public class TableResource {
   }
 
   @Inject
-  public TableResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
+  public TableResource(CollectionDAO dao, Authorizer authorizer) {
     this.dao = new TableRepository(dao);
     this.authorizer = authorizer;
   }
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/events/EventResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/events/EventResource.java
index 131e4e0a9fa..dba1d7bfd2c 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/events/EventResource.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/events/EventResource.java
@@ -40,7 +40,7 @@ import org.openmetadata.catalog.Entity.EntityList;
 import org.openmetadata.catalog.jdbi3.ChangeEventRepository;
 import org.openmetadata.catalog.jdbi3.CollectionDAO;
 import org.openmetadata.catalog.resources.Collection;
-import org.openmetadata.catalog.security.CatalogAuthorizer;
+import org.openmetadata.catalog.security.Authorizer;
 import org.openmetadata.catalog.type.ChangeEvent;
 import org.openmetadata.catalog.util.RestUtil;
 import org.openmetadata.catalog.util.ResultList;
@@ -52,7 +52,7 @@ import org.openmetadata.catalog.util.ResultList;
 @Collection(name = "events")
 public class EventResource {
   private final ChangeEventRepository dao;
-  private final CatalogAuthorizer authorizer;
+  private final Authorizer authorizer;
 
   public static class ChangeEventList extends ResultList<ChangeEvent> {
 
@@ -66,7 +66,7 @@ public class EventResource {
   }
 
   @Inject
-  public EventResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
+  public EventResource(CollectionDAO dao, Authorizer authorizer) {
     Objects.requireNonNull(dao, "ChangeEventRepository must not be null");
     this.dao = new ChangeEventRepository(dao);
     this.authorizer = authorizer;
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/events/WebhookResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/events/WebhookResource.java
index a0855e042e2..562f9b4f64b 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/events/WebhookResource.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/events/WebhookResource.java
@@ -50,7 +50,7 @@ import org.openmetadata.catalog.api.events.CreateWebhook;
 import org.openmetadata.catalog.jdbi3.CollectionDAO;
 import org.openmetadata.catalog.jdbi3.WebhookRepository;
 import org.openmetadata.catalog.resources.Collection;
-import org.openmetadata.catalog.security.CatalogAuthorizer;
+import org.openmetadata.catalog.security.Authorizer;
 import org.openmetadata.catalog.security.SecurityUtil;
 import org.openmetadata.catalog.type.ChangeEvent;
 import org.openmetadata.catalog.type.EntityHistory;
@@ -69,7 +69,7 @@ import org.openmetadata.catalog.util.ResultList;
 public class WebhookResource {
   public static final String COLLECTION_PATH = "v1/webhook/";
   private final WebhookRepository dao;
-  private final CatalogAuthorizer authorizer;
+  private final Authorizer authorizer;
 
   public static class WebhookList extends ResultList<Webhook> {
 
@@ -83,7 +83,7 @@ public class WebhookResource {
   }
 
   @Inject
-  public WebhookResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
+  public WebhookResource(CollectionDAO dao, Authorizer authorizer) {
     Objects.requireNonNull(dao, "ChangeEventRepository must not be null");
     this.dao = new WebhookRepository(dao);
     this.authorizer = authorizer;
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/feeds/FeedResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/feeds/FeedResource.java
index ca1c4f9f8d9..dc30dd41a4c 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/feeds/FeedResource.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/feeds/FeedResource.java
@@ -42,7 +42,7 @@ import org.openmetadata.catalog.entity.feed.Thread;
 import org.openmetadata.catalog.jdbi3.CollectionDAO;
 import org.openmetadata.catalog.jdbi3.FeedRepository;
 import org.openmetadata.catalog.resources.Collection;
-import org.openmetadata.catalog.security.CatalogAuthorizer;
+import org.openmetadata.catalog.security.Authorizer;
 import org.openmetadata.catalog.type.Post;
 import org.openmetadata.catalog.util.RestUtil;
 import org.openmetadata.catalog.util.ResultList;
@@ -68,7 +68,7 @@ public class FeedResource {
   }
 
   @Inject
-  public FeedResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
+  public FeedResource(CollectionDAO dao, Authorizer authorizer) {
     Objects.requireNonNull(dao, "FeedRepository must not be null");
     this.dao = new FeedRepository(dao);
   }
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/lineage/LineageResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/lineage/LineageResource.java
index 72cb24d7896..8ec321be705 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/lineage/LineageResource.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/lineage/LineageResource.java
@@ -44,7 +44,7 @@ import org.openmetadata.catalog.jdbi3.CollectionDAO;
 import org.openmetadata.catalog.jdbi3.LineageRepository;
 import org.openmetadata.catalog.resources.Collection;
 import org.openmetadata.catalog.resources.teams.UserResource;
-import org.openmetadata.catalog.security.CatalogAuthorizer;
+import org.openmetadata.catalog.security.Authorizer;
 import org.openmetadata.catalog.type.EntityLineage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -59,7 +59,7 @@ public class LineageResource {
   private final LineageRepository dao;
 
   @Inject
-  public LineageResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
+  public LineageResource(CollectionDAO dao, Authorizer authorizer) {
     Objects.requireNonNull(dao, "LineageRepository must not be null");
     this.dao = new LineageRepository(dao);
   }
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/locations/LocationResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/locations/LocationResource.java
index 4ab3c6ce11d..fcaa7334442 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/locations/LocationResource.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/locations/LocationResource.java
@@ -58,7 +58,7 @@ import org.openmetadata.catalog.entity.data.Location;
 import org.openmetadata.catalog.jdbi3.CollectionDAO;
 import org.openmetadata.catalog.jdbi3.LocationRepository;
 import org.openmetadata.catalog.resources.Collection;
-import org.openmetadata.catalog.security.CatalogAuthorizer;
+import org.openmetadata.catalog.security.Authorizer;
 import org.openmetadata.catalog.security.SecurityUtil;
 import org.openmetadata.catalog.type.EntityHistory;
 import org.openmetadata.catalog.util.EntityUtil.Fields;
@@ -75,7 +75,7 @@ import org.openmetadata.catalog.util.ResultList;
 public class LocationResource {
   public static final String COLLECTION_PATH = "v1/locations/";
   private final LocationRepository dao;
-  private final CatalogAuthorizer authorizer;
+  private final Authorizer authorizer;
 
   public static Location addHref(UriInfo uriInfo, Location location) {
     Entity.withHref(uriInfo, location.getOwner());
@@ -85,7 +85,7 @@ public class LocationResource {
   }
 
   @Inject
-  public LocationResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
+  public LocationResource(CollectionDAO dao, Authorizer authorizer) {
     Objects.requireNonNull(dao, "LocationRepository must not be null");
     this.dao = new LocationRepository(dao);
     this.authorizer = authorizer;
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/metrics/MetricsResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/metrics/MetricsResource.java
index d2e6bb322bf..16765ae1638 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/metrics/MetricsResource.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/metrics/MetricsResource.java
@@ -49,7 +49,7 @@ import org.openmetadata.catalog.entity.data.Metrics;
 import org.openmetadata.catalog.jdbi3.CollectionDAO;
 import org.openmetadata.catalog.jdbi3.MetricsRepository;
 import org.openmetadata.catalog.resources.Collection;
-import org.openmetadata.catalog.security.CatalogAuthorizer;
+import org.openmetadata.catalog.security.Authorizer;
 import org.openmetadata.catalog.util.EntityUtil.Fields;
 import org.openmetadata.catalog.util.RestUtil;
 import org.openmetadata.catalog.util.RestUtil.PutResponse;
@@ -65,7 +65,7 @@ public class MetricsResource {
   private final MetricsRepository dao;
 
   @Inject
-  public MetricsResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
+  public MetricsResource(CollectionDAO dao, Authorizer authorizer) {
     Objects.requireNonNull(dao, "MetricsRepository must not be null");
     this.dao = new MetricsRepository(dao);
   }
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/mlmodels/MlModelResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/mlmodels/MlModelResource.java
index 436ff74fb46..454f98b7511 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/mlmodels/MlModelResource.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/mlmodels/MlModelResource.java
@@ -58,7 +58,7 @@ import org.openmetadata.catalog.entity.data.MlModel;
 import org.openmetadata.catalog.jdbi3.CollectionDAO;
 import org.openmetadata.catalog.jdbi3.MlModelRepository;
 import org.openmetadata.catalog.resources.Collection;
-import org.openmetadata.catalog.security.CatalogAuthorizer;
+import org.openmetadata.catalog.security.Authorizer;
 import org.openmetadata.catalog.security.SecurityUtil;
 import org.openmetadata.catalog.type.EntityHistory;
 import org.openmetadata.catalog.util.EntityUtil.Fields;
@@ -75,7 +75,7 @@ import org.openmetadata.catalog.util.ResultList;
 public class MlModelResource {
   public static final String COLLECTION_PATH = "v1/mlmodels/";
   private final MlModelRepository dao;
-  private final CatalogAuthorizer authorizer;
+  private final Authorizer authorizer;
 
   public static MlModel addHref(UriInfo uriInfo, MlModel mlmodel) {
     mlmodel.setHref(RestUtil.getHref(uriInfo, COLLECTION_PATH, mlmodel.getId()));
@@ -86,7 +86,7 @@ public class MlModelResource {
   }
 
   @Inject
-  public MlModelResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
+  public MlModelResource(CollectionDAO dao, Authorizer authorizer) {
     Objects.requireNonNull(dao, "ModelRepository must not be null");
     this.dao = new MlModelRepository(dao);
     this.authorizer = authorizer;
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/operations/IngestionResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/operations/IngestionResource.java
index bb04fe48abe..6d568e2b67d 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/operations/IngestionResource.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/operations/IngestionResource.java
@@ -62,7 +62,7 @@ import org.openmetadata.catalog.jdbi3.CollectionDAO;
 import org.openmetadata.catalog.jdbi3.IngestionRepository;
 import org.openmetadata.catalog.operations.workflows.Ingestion;
 import org.openmetadata.catalog.resources.Collection;
-import org.openmetadata.catalog.security.CatalogAuthorizer;
+import org.openmetadata.catalog.security.Authorizer;
 import org.openmetadata.catalog.security.SecurityUtil;
 import org.openmetadata.catalog.type.EntityHistory;
 import org.openmetadata.catalog.type.EntityReference;
@@ -84,7 +84,7 @@ public class IngestionResource {
 
   public static final String COLLECTION_PATH = "operations/v1/ingestion/";
   private final IngestionRepository dao;
-  private final CatalogAuthorizer authorizer;
+  private final Authorizer authorizer;
   private AirflowRESTClient airflowRESTClient;
   private CatalogApplicationConfig config;
 
@@ -104,7 +104,7 @@ public class IngestionResource {
   }
 
   @Inject
-  public IngestionResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
+  public IngestionResource(CollectionDAO dao, Authorizer authorizer) {
     Objects.requireNonNull(dao, "IngestionRepository must not be null");
     this.dao = new IngestionRepository(dao);
     this.authorizer = authorizer;
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/pipelines/PipelineResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/pipelines/PipelineResource.java
index dbe093df2ac..3d0747060c9 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/pipelines/PipelineResource.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/pipelines/PipelineResource.java
@@ -60,7 +60,7 @@ import org.openmetadata.catalog.entity.data.Pipeline;
 import org.openmetadata.catalog.jdbi3.CollectionDAO;
 import org.openmetadata.catalog.jdbi3.PipelineRepository;
 import org.openmetadata.catalog.resources.Collection;
-import org.openmetadata.catalog.security.CatalogAuthorizer;
+import org.openmetadata.catalog.security.Authorizer;
 import org.openmetadata.catalog.security.SecurityUtil;
 import org.openmetadata.catalog.type.EntityHistory;
 import org.openmetadata.catalog.util.EntityUtil.Fields;
@@ -77,7 +77,7 @@ import org.openmetadata.catalog.util.ResultList;
 public class PipelineResource {
   public static final String COLLECTION_PATH = "v1/pipelines/";
   private final PipelineRepository dao;
-  private final CatalogAuthorizer authorizer;
+  private final Authorizer authorizer;
 
   public static ResultList<Pipeline> addHref(UriInfo uriInfo, ResultList<Pipeline> pipelines) {
     Optional.ofNullable(pipelines.getData()).orElse(Collections.emptyList()).forEach(i -> addHref(uriInfo, i));
@@ -93,7 +93,7 @@ public class PipelineResource {
   }
 
   @Inject
-  public PipelineResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
+  public PipelineResource(CollectionDAO dao, Authorizer authorizer) {
     Objects.requireNonNull(dao, "PipelineRepository must not be null");
     this.dao = new PipelineRepository(dao);
     this.authorizer = authorizer;
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/policies/PolicyResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/policies/PolicyResource.java
index c3abef558ce..6d326748184 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/policies/PolicyResource.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/policies/PolicyResource.java
@@ -60,7 +60,7 @@ import org.openmetadata.catalog.entity.policies.Policy;
 import org.openmetadata.catalog.jdbi3.CollectionDAO;
 import org.openmetadata.catalog.jdbi3.PolicyRepository;
 import org.openmetadata.catalog.resources.Collection;
-import org.openmetadata.catalog.security.CatalogAuthorizer;
+import org.openmetadata.catalog.security.Authorizer;
 import org.openmetadata.catalog.security.SecurityUtil;
 import org.openmetadata.catalog.type.EntityHistory;
 import org.openmetadata.catalog.type.EntityReference;
@@ -78,7 +78,7 @@ import org.openmetadata.catalog.util.ResultList;
 public class PolicyResource {
   public static final String COLLECTION_PATH = "v1/policies/";
   private final PolicyRepository dao;
-  private final CatalogAuthorizer authorizer;
+  private final Authorizer authorizer;
 
   public static ResultList<Policy> addHref(UriInfo uriInfo, ResultList<Policy> policies) {
     Optional.ofNullable(policies.getData()).orElse(Collections.emptyList()).forEach(i -> addHref(uriInfo, i));
@@ -91,7 +91,7 @@ public class PolicyResource {
   }
 
   @Inject
-  public PolicyResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
+  public PolicyResource(CollectionDAO dao, Authorizer authorizer) {
     Objects.requireNonNull(dao, "PolicyRepository must not be null");
     this.dao = new PolicyRepository(dao);
     this.authorizer = authorizer;
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/reports/ReportResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/reports/ReportResource.java
index 340a2752c9a..97a670487ac 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/reports/ReportResource.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/reports/ReportResource.java
@@ -46,7 +46,7 @@ import org.openmetadata.catalog.entity.data.Report;
 import org.openmetadata.catalog.jdbi3.CollectionDAO;
 import org.openmetadata.catalog.jdbi3.ReportRepository;
 import org.openmetadata.catalog.resources.Collection;
-import org.openmetadata.catalog.security.CatalogAuthorizer;
+import org.openmetadata.catalog.security.Authorizer;
 import org.openmetadata.catalog.util.EntityUtil.Fields;
 import org.openmetadata.catalog.util.RestUtil.PutResponse;
 import org.openmetadata.catalog.util.ResultList;
@@ -61,7 +61,7 @@ public class ReportResource {
   private final ReportRepository dao;
 
   @Inject
-  public ReportResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
+  public ReportResource(CollectionDAO dao, Authorizer authorizer) {
     Objects.requireNonNull(dao, "ReportRepository must not be null");
     this.dao = new ReportRepository(dao);
   }
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/dashboard/DashboardServiceResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/dashboard/DashboardServiceResource.java
index 4463fbf0ca1..3604d2fc741 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/dashboard/DashboardServiceResource.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/dashboard/DashboardServiceResource.java
@@ -51,7 +51,7 @@ import org.openmetadata.catalog.entity.services.DashboardService;
 import org.openmetadata.catalog.jdbi3.CollectionDAO;
 import org.openmetadata.catalog.jdbi3.DashboardServiceRepository;
 import org.openmetadata.catalog.resources.Collection;
-import org.openmetadata.catalog.security.CatalogAuthorizer;
+import org.openmetadata.catalog.security.Authorizer;
 import org.openmetadata.catalog.security.SecurityUtil;
 import org.openmetadata.catalog.type.EntityHistory;
 import org.openmetadata.catalog.util.RestUtil;
@@ -66,10 +66,10 @@ import org.openmetadata.catalog.util.ResultList;
 public class DashboardServiceResource {
   public static final String COLLECTION_PATH = "v1/services/dashboardServices";
   private final DashboardServiceRepository dao;
-  private final CatalogAuthorizer authorizer;
+  private final Authorizer authorizer;
 
   @Inject
-  public DashboardServiceResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
+  public DashboardServiceResource(CollectionDAO dao, Authorizer authorizer) {
     Objects.requireNonNull(dao, "DashboardServiceRepository must not be null");
     this.dao = new DashboardServiceRepository(dao);
     this.authorizer = authorizer;
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/database/DatabaseServiceResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/database/DatabaseServiceResource.java
index f292a969ca3..eb0f2e0b655 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/database/DatabaseServiceResource.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/database/DatabaseServiceResource.java
@@ -51,7 +51,7 @@ import org.openmetadata.catalog.entity.services.DatabaseService;
 import org.openmetadata.catalog.jdbi3.CollectionDAO;
 import org.openmetadata.catalog.jdbi3.DatabaseServiceRepository;
 import org.openmetadata.catalog.resources.Collection;
-import org.openmetadata.catalog.security.CatalogAuthorizer;
+import org.openmetadata.catalog.security.Authorizer;
 import org.openmetadata.catalog.security.SecurityUtil;
 import org.openmetadata.catalog.type.EntityHistory;
 import org.openmetadata.catalog.util.RestUtil;
@@ -66,10 +66,10 @@ import org.openmetadata.catalog.util.ResultList;
 public class DatabaseServiceResource {
   public static final String COLLECTION_PATH = "v1/services/databaseServices/";
   private final DatabaseServiceRepository dao;
-  private final CatalogAuthorizer authorizer;
+  private final Authorizer authorizer;
 
   @Inject
-  public DatabaseServiceResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
+  public DatabaseServiceResource(CollectionDAO dao, Authorizer authorizer) {
     Objects.requireNonNull(dao, "DatabaseServiceRepository must not be null");
     this.dao = new DatabaseServiceRepository(dao);
     this.authorizer = authorizer;
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/messaging/MessagingServiceResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/messaging/MessagingServiceResource.java
index 3427f4e33b6..be756990400 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/messaging/MessagingServiceResource.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/messaging/MessagingServiceResource.java
@@ -51,7 +51,7 @@ import org.openmetadata.catalog.entity.services.MessagingService;
 import org.openmetadata.catalog.jdbi3.CollectionDAO;
 import org.openmetadata.catalog.jdbi3.MessagingServiceRepository;
 import org.openmetadata.catalog.resources.Collection;
-import org.openmetadata.catalog.security.CatalogAuthorizer;
+import org.openmetadata.catalog.security.Authorizer;
 import org.openmetadata.catalog.security.SecurityUtil;
 import org.openmetadata.catalog.type.EntityHistory;
 import org.openmetadata.catalog.util.RestUtil;
@@ -66,10 +66,10 @@ import org.openmetadata.catalog.util.ResultList;
 public class MessagingServiceResource {
   public static final String COLLECTION_PATH = "v1/services/messagingServices/";
   private final MessagingServiceRepository dao;
-  private final CatalogAuthorizer authorizer;
+  private final Authorizer authorizer;
 
   @Inject
-  public MessagingServiceResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
+  public MessagingServiceResource(CollectionDAO dao, Authorizer authorizer) {
     Objects.requireNonNull(dao, "MessagingServiceRepository must not be null");
     this.dao = new MessagingServiceRepository(dao);
     this.authorizer = authorizer;
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/pipeline/PipelineServiceResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/pipeline/PipelineServiceResource.java
index abd25097cbc..3633272f0da 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/pipeline/PipelineServiceResource.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/pipeline/PipelineServiceResource.java
@@ -51,7 +51,7 @@ import org.openmetadata.catalog.entity.services.PipelineService;
 import org.openmetadata.catalog.jdbi3.CollectionDAO;
 import org.openmetadata.catalog.jdbi3.PipelineServiceRepository;
 import org.openmetadata.catalog.resources.Collection;
-import org.openmetadata.catalog.security.CatalogAuthorizer;
+import org.openmetadata.catalog.security.Authorizer;
 import org.openmetadata.catalog.security.SecurityUtil;
 import org.openmetadata.catalog.type.EntityHistory;
 import org.openmetadata.catalog.type.EntityReference;
@@ -67,14 +67,14 @@ import org.openmetadata.catalog.util.ResultList;
 public class PipelineServiceResource {
   public static final String COLLECTION_PATH = "v1/services/pipelineServices/";
   private final PipelineServiceRepository dao;
-  private final CatalogAuthorizer authorizer;
+  private final Authorizer authorizer;
 
   public static EntityReference addHref(UriInfo uriInfo, EntityReference service) {
     return service.withHref(RestUtil.getHref(uriInfo, "v1/services/pipelineServices/", service.getId()));
   }
 
   @Inject
-  public PipelineServiceResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
+  public PipelineServiceResource(CollectionDAO dao, Authorizer authorizer) {
     Objects.requireNonNull(dao, "PipelineServiceRepository must not be null");
     this.dao = new PipelineServiceRepository(dao);
     this.authorizer = authorizer;
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/storage/StorageServiceResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/storage/StorageServiceResource.java
index c38e2103b6a..f9268cc4268 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/storage/StorageServiceResource.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/storage/StorageServiceResource.java
@@ -51,7 +51,7 @@ import org.openmetadata.catalog.entity.services.StorageService;
 import org.openmetadata.catalog.jdbi3.CollectionDAO;
 import org.openmetadata.catalog.jdbi3.StorageServiceRepository;
 import org.openmetadata.catalog.resources.Collection;
-import org.openmetadata.catalog.security.CatalogAuthorizer;
+import org.openmetadata.catalog.security.Authorizer;
 import org.openmetadata.catalog.security.SecurityUtil;
 import org.openmetadata.catalog.type.EntityHistory;
 import org.openmetadata.catalog.util.RestUtil;
@@ -66,10 +66,10 @@ import org.openmetadata.catalog.util.ResultList;
 public class StorageServiceResource {
   public static final String COLLECTION_PATH = "v1/services/storageServices/";
   private final StorageServiceRepository dao;
-  private final CatalogAuthorizer authorizer;
+  private final Authorizer authorizer;
 
   @Inject
-  public StorageServiceResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
+  public StorageServiceResource(CollectionDAO dao, Authorizer authorizer) {
     Objects.requireNonNull(dao, "StorageServiceRepository must not be null");
     this.dao = new StorageServiceRepository(dao);
     this.authorizer = authorizer;
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/tags/TagResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/tags/TagResource.java
index b5dc051270b..19ad7a50edc 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/tags/TagResource.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/tags/TagResource.java
@@ -48,7 +48,7 @@ import org.openmetadata.catalog.CatalogApplicationConfig;
 import org.openmetadata.catalog.jdbi3.CollectionDAO;
 import org.openmetadata.catalog.jdbi3.TagRepository;
 import org.openmetadata.catalog.resources.Collection;
-import org.openmetadata.catalog.security.CatalogAuthorizer;
+import org.openmetadata.catalog.security.Authorizer;
 import org.openmetadata.catalog.security.SecurityUtil;
 import org.openmetadata.catalog.type.CreateTag;
 import org.openmetadata.catalog.type.CreateTagCategory;
@@ -70,7 +70,7 @@ public class TagResource {
   public static final Logger LOG = LoggerFactory.getLogger(TagResource.class);
   public static final String TAG_COLLECTION_PATH = "/v1/tags/";
   private final TagRepository dao;
-  private final CatalogAuthorizer authorizer;
+  private final Authorizer authorizer;
 
   static class CategoryList extends ResultList<TagCategory> {
     @SuppressWarnings("unused") // Empty constructor needed for deserialization
@@ -82,7 +82,7 @@ public class TagResource {
   }
 
   @Inject
-  public TagResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
+  public TagResource(CollectionDAO dao, Authorizer authorizer) {
     Objects.requireNonNull(dao, "TagRepository must not be null");
     this.dao = new TagRepository(dao);
     this.authorizer = authorizer;
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/teams/TeamResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/teams/TeamResource.java
index 56c3a4bfa95..5efc114f21f 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/teams/TeamResource.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/teams/TeamResource.java
@@ -58,7 +58,7 @@ import org.openmetadata.catalog.entity.teams.Team;
 import org.openmetadata.catalog.jdbi3.CollectionDAO;
 import org.openmetadata.catalog.jdbi3.TeamRepository;
 import org.openmetadata.catalog.resources.Collection;
-import org.openmetadata.catalog.security.CatalogAuthorizer;
+import org.openmetadata.catalog.security.Authorizer;
 import org.openmetadata.catalog.security.SecurityUtil;
 import org.openmetadata.catalog.type.EntityHistory;
 import org.openmetadata.catalog.util.EntityUtil;
@@ -74,7 +74,7 @@ import org.openmetadata.catalog.util.ResultList;
 public class TeamResource {
   public static final String COLLECTION_PATH = "/v1/teams/";
   private final TeamRepository dao;
-  private final CatalogAuthorizer authorizer;
+  private final Authorizer authorizer;
 
   public static Team addHref(UriInfo uriInfo, Team team) {
     Entity.withHref(uriInfo, team.getUsers());
@@ -83,7 +83,7 @@ public class TeamResource {
   }
 
   @Inject
-  public TeamResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
+  public TeamResource(CollectionDAO dao, Authorizer authorizer) {
     Objects.requireNonNull(dao, "TeamRepository must not be null");
     this.dao = new TeamRepository(dao);
     this.authorizer = authorizer;
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/teams/UserResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/teams/UserResource.java
index d0432085f03..e5efff5cef9 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/teams/UserResource.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/teams/UserResource.java
@@ -63,7 +63,7 @@ import org.openmetadata.catalog.jdbi3.CollectionDAO;
 import org.openmetadata.catalog.jdbi3.UserRepository;
 import org.openmetadata.catalog.jdbi3.UserRepository.UserEntityInterface;
 import org.openmetadata.catalog.resources.Collection;
-import org.openmetadata.catalog.security.CatalogAuthorizer;
+import org.openmetadata.catalog.security.Authorizer;
 import org.openmetadata.catalog.security.SecurityUtil;
 import org.openmetadata.catalog.type.EntityHistory;
 import org.openmetadata.catalog.util.EntityUtil.Fields;
@@ -82,7 +82,7 @@ public class UserResource {
   public static final Logger LOG = LoggerFactory.getLogger(UserResource.class);
   public static final String COLLECTION_PATH = "v1/users/";
   private final UserRepository dao;
-  private final CatalogAuthorizer authorizer;
+  private final Authorizer authorizer;
 
   public static User addHref(UriInfo uriInfo, User user) {
     Entity.withHref(uriInfo, user.getTeams());
@@ -92,7 +92,7 @@ public class UserResource {
   }
 
   @Inject
-  public UserResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
+  public UserResource(CollectionDAO dao, Authorizer authorizer) {
     Objects.requireNonNull(dao, "UserRepository must not be null");
     this.dao = new UserRepository(dao);
     this.authorizer = authorizer;
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/topics/TopicResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/topics/TopicResource.java
index d4df225d869..03c1df4a978 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/topics/TopicResource.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/topics/TopicResource.java
@@ -59,7 +59,7 @@ import org.openmetadata.catalog.entity.data.Topic;
 import org.openmetadata.catalog.jdbi3.CollectionDAO;
 import org.openmetadata.catalog.jdbi3.TopicRepository;
 import org.openmetadata.catalog.resources.Collection;
-import org.openmetadata.catalog.security.CatalogAuthorizer;
+import org.openmetadata.catalog.security.Authorizer;
 import org.openmetadata.catalog.security.SecurityUtil;
 import org.openmetadata.catalog.type.EntityHistory;
 import org.openmetadata.catalog.util.EntityUtil.Fields;
@@ -76,7 +76,7 @@ import org.openmetadata.catalog.util.ResultList;
 public class TopicResource {
   public static final String COLLECTION_PATH = "v1/topics/";
   private final TopicRepository dao;
-  private final CatalogAuthorizer authorizer;
+  private final Authorizer authorizer;
 
   public static ResultList<Topic> addHref(UriInfo uriInfo, ResultList<Topic> topics) {
     Optional.ofNullable(topics.getData()).orElse(Collections.emptyList()).forEach(i -> addHref(uriInfo, i));
@@ -91,7 +91,7 @@ public class TopicResource {
   }
 
   @Inject
-  public TopicResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
+  public TopicResource(CollectionDAO dao, Authorizer authorizer) {
     this.dao = new TopicRepository(dao);
     this.authorizer = authorizer;
   }
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/usage/UsageResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/usage/UsageResource.java
index 2cedc3039ff..61beb4915ff 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/usage/UsageResource.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/usage/UsageResource.java
@@ -40,7 +40,7 @@ import org.openmetadata.catalog.jdbi3.CollectionDAO;
 import org.openmetadata.catalog.jdbi3.UsageRepository;
 import org.openmetadata.catalog.resources.Collection;
 import org.openmetadata.catalog.resources.teams.UserResource;
-import org.openmetadata.catalog.security.CatalogAuthorizer;
+import org.openmetadata.catalog.security.Authorizer;
 import org.openmetadata.catalog.type.DailyCount;
 import org.openmetadata.catalog.type.EntityUsage;
 import org.openmetadata.catalog.util.RestUtil;
@@ -57,7 +57,7 @@ public class UsageResource {
   private final UsageRepository dao;
 
   @Inject
-  public UsageResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
+  public UsageResource(CollectionDAO dao, Authorizer authorizer) {
     Objects.requireNonNull(dao, "UsageRepository must not be null");
     this.dao = new UsageRepository(dao);
   }
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/security/CatalogAuthorizer.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/security/Authorizer.java
similarity index 96%
rename from catalog-rest-service/src/main/java/org/openmetadata/catalog/security/CatalogAuthorizer.java
rename to catalog-rest-service/src/main/java/org/openmetadata/catalog/security/Authorizer.java
index 3007fa429fc..478dac57437 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/security/CatalogAuthorizer.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/security/Authorizer.java
@@ -16,7 +16,7 @@ package org.openmetadata.catalog.security;
 import org.jdbi.v3.core.Jdbi;
 import org.openmetadata.catalog.type.EntityReference;
 
-public interface CatalogAuthorizer {
+public interface Authorizer {
 
   /** Initialize the authorizer */
   void init(AuthorizerConfiguration config, Jdbi jdbi);
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/security/AuthorizerConfiguration.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/security/AuthorizerConfiguration.java
index 07828576a9b..fef7823c52e 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/security/AuthorizerConfiguration.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/security/AuthorizerConfiguration.java
@@ -27,8 +27,6 @@ public class AuthorizerConfiguration {
 
   @NotEmpty private String principalDomain;
 
-  private CatalogAuthorizerConfiguration catalogAuthorizerConfiguration;
-
   public String getClassName() {
     return className;
   }
@@ -45,14 +43,6 @@ public class AuthorizerConfiguration {
     this.containerRequestFilter = containerRequestFilter;
   }
 
-  public CatalogAuthorizerConfiguration getCatalogAuthorizerConfiguration() {
-    return catalogAuthorizerConfiguration;
-  }
-
-  public void setCatalogAuthorizerConfiguration(CatalogAuthorizerConfiguration catalogAuthorizerConfiguration) {
-    this.catalogAuthorizerConfiguration = catalogAuthorizerConfiguration;
-  }
-
   public Set<String> getAdminPrincipals() {
     return adminPrincipals;
   }
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/security/CatalogAuthorizerConfiguration.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/security/CatalogAuthorizerConfiguration.java
deleted file mode 100644
index 66517dba72d..00000000000
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/security/CatalogAuthorizerConfiguration.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *  Copyright 2021 Collate
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.openmetadata.catalog.security;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import java.util.Map;
-import javax.validation.constraints.NotEmpty;
-
-public class CatalogAuthorizerConfiguration {
-  @NotEmpty private String className;
-
-  @JsonProperty("properties")
-  private Map<String, Object> properties;
-
-  public String getClassName() {
-    return className;
-  }
-
-  public void setClassName(String className) {
-    this.className = className;
-  }
-
-  public Map<String, Object> getProperties() {
-    return properties;
-  }
-
-  public void setProperties(Map<String, Object> properties) {
-    this.properties = properties;
-  }
-
-  @Override
-  public String toString() {
-    return "CatalogAuthorizerConfiguration{" + "className='" + className + '\'' + ", properties=" + properties + '}';
-  }
-}
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/security/DefaultCatalogAuthorizer.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/security/DefaultAuthorizer.java
similarity index 97%
rename from catalog-rest-service/src/main/java/org/openmetadata/catalog/security/DefaultCatalogAuthorizer.java
rename to catalog-rest-service/src/main/java/org/openmetadata/catalog/security/DefaultAuthorizer.java
index 68b8202cc1f..fa814807605 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/security/DefaultCatalogAuthorizer.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/security/DefaultAuthorizer.java
@@ -34,8 +34,8 @@ import org.openmetadata.catalog.util.EntityUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class DefaultCatalogAuthorizer implements CatalogAuthorizer {
-  private static final Logger LOG = LoggerFactory.getLogger(DefaultCatalogAuthorizer.class);
+public class DefaultAuthorizer implements Authorizer {
+  private static final Logger LOG = LoggerFactory.getLogger(DefaultAuthorizer.class);
 
   private Set<String> adminUsers;
   private Set<String> botUsers;
@@ -46,7 +46,7 @@ public class DefaultCatalogAuthorizer implements CatalogAuthorizer {
 
   @Override
   public void init(AuthorizerConfiguration config, Jdbi dbi) {
-    LOG.debug("Initializing DefaultCatalogAuthorizer with config {}", config);
+    LOG.debug("Initializing DefaultAuthorizer with config {}", config);
     this.adminUsers = new HashSet<>(config.getAdminPrincipals());
     this.botUsers = new HashSet<>(config.getBotPrincipals());
     this.principalDomain = config.getPrincipalDomain();
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/security/NoopAuthorizer.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/security/NoopAuthorizer.java
index d2aad5dc866..e6684852599 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/security/NoopAuthorizer.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/security/NoopAuthorizer.java
@@ -18,7 +18,7 @@ import org.openmetadata.catalog.type.EntityReference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class NoopAuthorizer implements CatalogAuthorizer {
+public class NoopAuthorizer implements Authorizer {
   private static final Logger LOG = LoggerFactory.getLogger(NoopAuthorizer.class);
 
   @Override
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/security/SecurityUtil.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/security/SecurityUtil.java
index bd565046b89..973215623a4 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/security/SecurityUtil.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/security/SecurityUtil.java
@@ -28,7 +28,7 @@ public final class SecurityUtil {
 
   private SecurityUtil() {}
 
-  public static void checkAdminRole(CatalogAuthorizer authorizer, SecurityContext securityContext) {
+  public static void checkAdminRole(Authorizer authorizer, SecurityContext securityContext) {
     Principal principal = securityContext.getUserPrincipal();
     AuthenticationContext authenticationCtx = SecurityUtil.getAuthenticationContext(principal);
     if (!authorizer.isAdmin(authenticationCtx)) {
@@ -36,7 +36,7 @@ public final class SecurityUtil {
     }
   }
 
-  public static void checkAdminOrBotRole(CatalogAuthorizer authorizer, SecurityContext securityContext) {
+  public static void checkAdminOrBotRole(Authorizer authorizer, SecurityContext securityContext) {
     Principal principal = securityContext.getUserPrincipal();
     AuthenticationContext authenticationCtx = SecurityUtil.getAuthenticationContext(principal);
     if (!authorizer.isAdmin(authenticationCtx) && !authorizer.isBot(authenticationCtx)) {
@@ -45,7 +45,7 @@ public final class SecurityUtil {
   }
 
   public static void checkAdminRoleOrPermissions(
-      CatalogAuthorizer authorizer, SecurityContext securityContext, EntityReference entityReference) {
+      Authorizer authorizer, SecurityContext securityContext, EntityReference entityReference) {
     Principal principal = securityContext.getUserPrincipal();
     AuthenticationContext authenticationCtx = SecurityUtil.getAuthenticationContext(principal);
     if (!authorizer.isAdmin(authenticationCtx)
diff --git a/catalog-rest-service/src/test/resources/openmetadata-secure-test.yaml b/catalog-rest-service/src/test/resources/openmetadata-secure-test.yaml
index 98c73050cdd..40dae92cf42 100644
--- a/catalog-rest-service/src/test/resources/openmetadata-secure-test.yaml
+++ b/catalog-rest-service/src/test/resources/openmetadata-secure-test.yaml
@@ -118,7 +118,7 @@ health:
 
 # Authorizer Configuration
 authorizerConfiguration:
-  className: "org.openmetadata.catalog.security.DefaultCatalogAuthorizer"
+  className: "org.openmetadata.catalog.security.DefaultAuthorizer"
   # JWT Filter
   containerRequestFilter: "org.openmetadata.catalog.security.CatalogOpenIdAuthorizationRequestFilter"
   adminPrincipals:
diff --git a/conf/openmetadata-security.yaml b/conf/openmetadata-security.yaml
index 66a85d07082..e4b83cbb489 100644
--- a/conf/openmetadata-security.yaml
+++ b/conf/openmetadata-security.yaml
@@ -114,7 +114,7 @@ database:
 
 # Authorizer Configuration
 authorizerConfiguration:
-  className: "org.openmetadata.catalog.security.DefaultCatalogAuthorizer"
+  className: "org.openmetadata.catalog.security.DefaultAuthorizer"
   # JWT Filter
   containerRequestFilter: "org.openmetadata.catalog.security.JwtFilter"
   adminPrincipals:
diff --git a/docs/install/enable-security/auth0-sso/auth0-config.md b/docs/install/enable-security/auth0-sso/auth0-config.md
index 2499601ec48..8962dc2c8c4 100644
--- a/docs/install/enable-security/auth0-sso/auth0-config.md
+++ b/docs/install/enable-security/auth0-sso/auth0-config.md
@@ -19,7 +19,7 @@ authenticationConfiguration:
 
 ```
 authorizerConfiguration:
-  className: "org.openmetadata.catalog.security.DefaultCatalogAuthorizer"
+  className: "org.openmetadata.catalog.security.DefaultAuthorizer"
   # JWT Filter
   containerRequestFilter: "org.openmetadata.catalog.security.JwtFilter"
   adminPrincipals:
diff --git a/docs/install/enable-security/google-sso/google-config.md b/docs/install/enable-security/google-sso/google-config.md
index 6122419a9eb..e6851459c86 100644
--- a/docs/install/enable-security/google-sso/google-config.md
+++ b/docs/install/enable-security/google-sso/google-config.md
@@ -17,7 +17,7 @@ Then, update authorizerConfiguration to add adminPrincipals.
 
 ```
 authorizerConfiguration:
-  className: "org.openmetadata.catalog.security.DefaultCatalogAuthorizer"
+  className: "org.openmetadata.catalog.security.DefaultAuthorizer"
   # JWT Filter
   containerRequestFilter: "org.openmetadata.catalog.security.JwtFilter"
   adminPrincipals:
diff --git a/docs/install/enable-security/okta-sso/okta-config.md b/docs/install/enable-security/okta-sso/okta-config.md
index 1cc47844ccb..8a0f4925113 100644
--- a/docs/install/enable-security/okta-sso/okta-config.md
+++ b/docs/install/enable-security/okta-sso/okta-config.md
@@ -17,7 +17,7 @@ authenticationConfiguration:
 
 ```
 authorizerConfiguration:
-  className: "org.openmetadata.catalog.security.DefaultCatalogAuthorizer"
+  className: "org.openmetadata.catalog.security.DefaultAuthorizer"
   # JWT Filter
   containerRequestFilter: "org.openmetadata.catalog.security.JwtFilter"
   adminPrincipals:
diff --git a/docs/open-source-community/developer/quick-start-guide.md b/docs/open-source-community/developer/quick-start-guide.md
index 7667d537928..2a9e7474343 100644
--- a/docs/open-source-community/developer/quick-start-guide.md
+++ b/docs/open-source-community/developer/quick-start-guide.md
@@ -51,7 +51,7 @@ OpenMetadata uses Elasticsearch to store the Entity change events and makes it s
 Elasticsearch indices are created when the [`OpenMetadata/ingestion/pipelines/metadata_to_es.json`](https://github.com/open-metadata/OpenMetadata/blob/main/ingestion/pipelines/metadata_to_es.json) ingestion connector is run.
 
 ### Authentication/Authorization  
-OpenMetadata uses Google OAuth for authentication. All incoming requests are filtered by validating the JWT token using the Google OAuth provider. Access control is provided by [`CatalogAuthorizer`](https://github.com/open-metadata/OpenMetadata/blob/main/catalog-rest-service/src/main/java/org/openmetadata/catalog/security/CatalogAuthorizer.java).
+OpenMetadata uses Google OAuth for authentication. All incoming requests are filtered by validating the JWT token using the Google OAuth provider. Access control is provided by [`Authorizer`](https://github.com/open-metadata/OpenMetadata/blob/main/catalog-rest-service/src/main/java/org/openmetadata/catalog/security/Authorizer.java).
 
 See the configuration file [`OpenMetadata/conf/openmetadata-security.yaml`](https://github.com/open-metadata/OpenMetadata/blob/main/conf/openmetadata-security.yaml) for the authentication and authorization configurations.