diff --git a/api/observability/v1alpha1/loki_limit_types.go b/api/observability/v1alpha1/loki_limit_types.go
index 671400f..b016cf0 100644
--- a/api/observability/v1alpha1/loki_limit_types.go
+++ b/api/observability/v1alpha1/loki_limit_types.go
@@ -239,15 +239,15 @@ type RulerAlertManagerConfig struct {
 
 type NotifierConfig struct {
 	// +kubebuilder:validation:Optional
-	TLS *TLSClientConfig `yaml:",inline,omitempty" json:",inline,omitempty"`
+	TLS *NotifierTLSClientConfig `yaml:",inline,omitempty" json:",inline,omitempty"`
 	// +kubebuilder:validation:Optional
-	BasicAuth *NotifBasicAuth `yaml:",inline,omitempty" json:",inline,omitempty"`
+	BasicAuth *NotifierBasicAuth `yaml:",inline,omitempty" json:",inline,omitempty"`
 	// +kubebuilder:validation:Optional
-	HeaderAuth *HeaderAuth `yaml:",inline,omitempty" json:",inline,omitempty"`
+	HeaderAuth *NotifierHeaderAuth `yaml:",inline,omitempty" json:",inline,omitempty"`
 }
 
 // NotifBasicAuth configures basic authentication for HTTP clients.
-type NotifBasicAuth struct {
+type NotifierBasicAuth struct {
 	// +kubebuilder:validation:Optional
 	Username string `yaml:"basic_auth_username,omitempty" json:"basic_auth_username,omitempty"`
 	// +kubebuilder:validation:Optional
@@ -255,7 +255,7 @@ type NotifBasicAuth struct {
 }
 
 // HeaderAuth condigures header based authorization for HTTP clients.
-type HeaderAuth struct {
+type NotifierHeaderAuth struct {
 	// +kubebuilder:validation:Optional
 	Type string `yaml:"type,omitempty" json:"type,omitempty"`
 	// +kubebuilder:validation:Optional
@@ -265,7 +265,7 @@ type HeaderAuth struct {
 }
 
 // ClientConfig is the config for client TLS.
-type TLSClientConfig struct {
+type NotifierTLSClientConfig struct {
 	// +kubebuilder:validation:Optional
 	CertPath *string `yaml:"tls_cert_path,omitempty" json:"tls_cert_path,omitempty" category:"advanced"`
 	// +kubebuilder:validation:Optional
diff --git a/api/observability/v1alpha1/zz_generated.deepcopy.go b/api/observability/v1alpha1/zz_generated.deepcopy.go
index cb7aefa..5032352 100644
--- a/api/observability/v1alpha1/zz_generated.deepcopy.go
+++ b/api/observability/v1alpha1/zz_generated.deepcopy.go
@@ -304,21 +304,6 @@ func (in *HTTPClientConfig) DeepCopy() *HTTPClientConfig {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *HeaderAuth) DeepCopyInto(out *HeaderAuth) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new HeaderAuth.
-func (in *HeaderAuth) DeepCopy() *HeaderAuth {
-	if in == nil {
-		return nil
-	}
-	out := new(HeaderAuth)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *LimitSpec) DeepCopyInto(out *LimitSpec) {
 	*out = *in
@@ -1803,16 +1788,16 @@ func (in *MultiRuntimeConfig) DeepCopy() *MultiRuntimeConfig {
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *NotifBasicAuth) DeepCopyInto(out *NotifBasicAuth) {
+func (in *NotifierBasicAuth) DeepCopyInto(out *NotifierBasicAuth) {
 	*out = *in
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NotifBasicAuth.
-func (in *NotifBasicAuth) DeepCopy() *NotifBasicAuth {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NotifierBasicAuth.
+func (in *NotifierBasicAuth) DeepCopy() *NotifierBasicAuth {
 	if in == nil {
 		return nil
 	}
-	out := new(NotifBasicAuth)
+	out := new(NotifierBasicAuth)
 	in.DeepCopyInto(out)
 	return out
 }
@@ -1822,17 +1807,17 @@ func (in *NotifierConfig) DeepCopyInto(out *NotifierConfig) {
 	*out = *in
 	if in.TLS != nil {
 		in, out := &in.TLS, &out.TLS
-		*out = new(TLSClientConfig)
+		*out = new(NotifierTLSClientConfig)
 		(*in).DeepCopyInto(*out)
 	}
 	if in.BasicAuth != nil {
 		in, out := &in.BasicAuth, &out.BasicAuth
-		*out = new(NotifBasicAuth)
+		*out = new(NotifierBasicAuth)
 		**out = **in
 	}
 	if in.HeaderAuth != nil {
 		in, out := &in.HeaderAuth, &out.HeaderAuth
-		*out = new(HeaderAuth)
+		*out = new(NotifierHeaderAuth)
 		**out = **in
 	}
 }
@@ -1847,6 +1832,71 @@ func (in *NotifierConfig) DeepCopy() *NotifierConfig {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *NotifierHeaderAuth) DeepCopyInto(out *NotifierHeaderAuth) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NotifierHeaderAuth.
+func (in *NotifierHeaderAuth) DeepCopy() *NotifierHeaderAuth {
+	if in == nil {
+		return nil
+	}
+	out := new(NotifierHeaderAuth)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *NotifierTLSClientConfig) DeepCopyInto(out *NotifierTLSClientConfig) {
+	*out = *in
+	if in.CertPath != nil {
+		in, out := &in.CertPath, &out.CertPath
+		*out = new(string)
+		**out = **in
+	}
+	if in.KeyPath != nil {
+		in, out := &in.KeyPath, &out.KeyPath
+		*out = new(string)
+		**out = **in
+	}
+	if in.CAPath != nil {
+		in, out := &in.CAPath, &out.CAPath
+		*out = new(string)
+		**out = **in
+	}
+	if in.ServerName != nil {
+		in, out := &in.ServerName, &out.ServerName
+		*out = new(string)
+		**out = **in
+	}
+	if in.InsecureSkipVerify != nil {
+		in, out := &in.InsecureSkipVerify, &out.InsecureSkipVerify
+		*out = new(bool)
+		**out = **in
+	}
+	if in.CipherSuites != nil {
+		in, out := &in.CipherSuites, &out.CipherSuites
+		*out = new(string)
+		**out = **in
+	}
+	if in.MinVersion != nil {
+		in, out := &in.MinVersion, &out.MinVersion
+		*out = new(string)
+		**out = **in
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NotifierTLSClientConfig.
+func (in *NotifierTLSClientConfig) DeepCopy() *NotifierTLSClientConfig {
+	if in == nil {
+		return nil
+	}
+	out := new(NotifierTLSClientConfig)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *OAuth2) DeepCopyInto(out *OAuth2) {
 	*out = *in
@@ -2290,56 +2340,6 @@ func (in *StreamRetention) DeepCopy() *StreamRetention {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *TLSClientConfig) DeepCopyInto(out *TLSClientConfig) {
-	*out = *in
-	if in.CertPath != nil {
-		in, out := &in.CertPath, &out.CertPath
-		*out = new(string)
-		**out = **in
-	}
-	if in.KeyPath != nil {
-		in, out := &in.KeyPath, &out.KeyPath
-		*out = new(string)
-		**out = **in
-	}
-	if in.CAPath != nil {
-		in, out := &in.CAPath, &out.CAPath
-		*out = new(string)
-		**out = **in
-	}
-	if in.ServerName != nil {
-		in, out := &in.ServerName, &out.ServerName
-		*out = new(string)
-		**out = **in
-	}
-	if in.InsecureSkipVerify != nil {
-		in, out := &in.InsecureSkipVerify, &out.InsecureSkipVerify
-		*out = new(bool)
-		**out = **in
-	}
-	if in.CipherSuites != nil {
-		in, out := &in.CipherSuites, &out.CipherSuites
-		*out = new(string)
-		**out = **in
-	}
-	if in.MinVersion != nil {
-		in, out := &in.MinVersion, &out.MinVersion
-		*out = new(string)
-		**out = **in
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TLSClientConfig.
-func (in *TLSClientConfig) DeepCopy() *TLSClientConfig {
-	if in == nil {
-		return nil
-	}
-	out := new(TLSClientConfig)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *TempoLimits) DeepCopyInto(out *TempoLimits) {
 	*out = *in