diff --git a/lib/src/observables/observables/observable.dart b/lib/src/observables/observables/observable.dart
index 395093f..9150fbb 100644
--- a/lib/src/observables/observables/observable.dart
+++ b/lib/src/observables/observables/observable.dart
@@ -5,14 +5,14 @@ import 'package:typedef_equals/typedef_equals.dart';
 import '../observers/observer.dart';
 import '../subjects/subject.dart';
 import '../subjects/replay_subject.dart';
-import 'create_observable.dart';
-import 'cast_observable.dart';
-import 'combine_observable.dart';
-import 'distinct_observable.dart';
-import 'map_observable.dart';
-import 'multicast_observable.dart';
-import 'skip_observable.dart';
-import 'where_observable.dart';
+import 'observable_create.dart';
+import 'observable_cast.dart';
+import 'observable_combine.dart';
+import 'observable_distinct.dart';
+import 'observable_map.dart';
+import 'observable_multicast.dart';
+import 'observable_skip.dart';
+import 'observable_where.dart';
 
 typedef Observe<T> = Disposable Function(OnData<T> onData);
 
@@ -22,12 +22,12 @@ abstract class Observable<T> {
 
   const factory Observable(
     Observe<T> observe
-  ) = CreateObservable;
+  ) = ObservableCreate;
 
   static Observable<R> combine<T, R>({
     required List<Observable<T>> children,
     required R Function(List<T> items) combiner,
-  }) => CombineObservable(
+  }) => ObservableCombine(
     children: children,
     combiner: combiner,
   );
@@ -59,27 +59,27 @@ abstract class Observable<T> {
 extension ObservableX<T> on Observable<T> {
 
   Observable<R> map<R>(R Function(T) convert) {
-    return MapObservable<T, R>(
+    return ObservableMap<T, R>(
       convert: convert,
       child: this,
     );
   }
 
   Observable<T> where(bool Function(T) test) {
-    return WhereObservable<T>(
+    return ObservableWhere<T>(
       test: test,
       child: this,
     );
   }
 
   Observable<R> cast<R>() {
-    return CastObservable<T, R>(
+    return ObservableCast<T, R>(
       child: this,
     );
   }
 
   Observable<T> distinct([Equals<T>? equals]) {
-    return DistinctObservable<T>(
+    return ObservableDistinct<T>(
       equals: equals,
       child: this,
     );
@@ -92,7 +92,7 @@ extension ObservableX<T> on Observable<T> {
     .distinct(equals);
 
   Observable<T> skip(int n) {
-    return SkipObservable(
+    return ObservableSkip(
       n: n,
       child: this,
     );
@@ -101,7 +101,7 @@ extension ObservableX<T> on Observable<T> {
   Observable<T> multicast({
     Subject<T> Function()? createSubject,
   }) {
-    return MulticastObservable<T>(
+    return ObservableMulticast<T>(
       createSubject: createSubject,
       child: this,
     );
diff --git a/lib/src/observables/observables/cast_observable.dart b/lib/src/observables/observables/observable_cast.dart
similarity index 82%
rename from lib/src/observables/observables/cast_observable.dart
rename to lib/src/observables/observables/observable_cast.dart
index d713e1d..23eb9df 100644
--- a/lib/src/observables/observables/cast_observable.dart
+++ b/lib/src/observables/observables/observable_cast.dart
@@ -6,9 +6,9 @@ import '../observers/observer.dart';
 import 'observable.dart';
 
 @internal
-class CastObservable<T, R> implements Observable<R> {
+class ObservableCast<T, R> implements Observable<R> {
 
-  const CastObservable({
+  const ObservableCast({
     required Observable<T> child,
   }): _child = child;
 
diff --git a/lib/src/observables/observables/combine_observable.dart b/lib/src/observables/observables/observable_combine.dart
similarity index 90%
rename from lib/src/observables/observables/combine_observable.dart
rename to lib/src/observables/observables/observable_combine.dart
index aa91597..5a0d860 100644
--- a/lib/src/observables/observables/combine_observable.dart
+++ b/lib/src/observables/observables/observable_combine.dart
@@ -6,9 +6,9 @@ import '../observers/observer.dart';
 import 'observable.dart';
 
 @internal
-class CombineObservable<T, R> implements Observable<R> {
+class ObservableCombine<T, R> implements Observable<R> {
 
-  const CombineObservable({
+  const ObservableCombine({
     required List<Observable<T>> children,
     required R Function(List<T> items) combiner,
   }): _children = children,
@@ -52,7 +52,7 @@ class CombineObservable<T, R> implements Observable<R> {
 }
 
 @internal
-class CombineObservable2<T1, T2, R> extends CombineObservable<Object?, R> {
+class CombineObservable2<T1, T2, R> extends ObservableCombine<Object?, R> {
 
   CombineObservable2({
     required Observable<T1> child1,
@@ -71,7 +71,7 @@ class CombineObservable2<T1, T2, R> extends CombineObservable<Object?, R> {
 }
 
 @internal
-class CombineObservable3<T1, T2, T3, R> extends CombineObservable<Object?, R> {
+class CombineObservable3<T1, T2, T3, R> extends ObservableCombine<Object?, R> {
 
   CombineObservable3({
     required Observable<T1> child1,
diff --git a/lib/src/observables/observables/create_observable.dart b/lib/src/observables/observables/observable_create.dart
similarity index 84%
rename from lib/src/observables/observables/create_observable.dart
rename to lib/src/observables/observables/observable_create.dart
index 1829c30..4ca554f 100644
--- a/lib/src/observables/observables/create_observable.dart
+++ b/lib/src/observables/observables/observable_create.dart
@@ -6,9 +6,9 @@ import 'observable.dart';
 import '../observers/observer.dart';
 
 @internal
-class CreateObservable<T> implements Observable<T> {
+class ObservableCreate<T> implements Observable<T> {
 
-  const CreateObservable(this._observe);
+  const ObservableCreate(this._observe);
 
   final Observe<T> _observe;
 
diff --git a/lib/src/observables/observables/distinct_observable.dart b/lib/src/observables/observables/observable_distinct.dart
similarity index 90%
rename from lib/src/observables/observables/distinct_observable.dart
rename to lib/src/observables/observables/observable_distinct.dart
index 9540fe3..7b00b7b 100644
--- a/lib/src/observables/observables/distinct_observable.dart
+++ b/lib/src/observables/observables/observable_distinct.dart
@@ -8,8 +8,8 @@ import '../observers/observer.dart';
 import 'observable.dart';
 
 @internal
-class DistinctObservable<T> implements Observable<T> {
-  const DistinctObservable({
+class ObservableDistinct<T> implements Observable<T> {
+  const ObservableDistinct({
     required Equals<T>? equals,
     required Observable<T> child,
   }): _equals = equals ?? defaultEquals,
diff --git a/lib/src/observables/observables/map_observable.dart b/lib/src/observables/observables/observable_map.dart
similarity index 86%
rename from lib/src/observables/observables/map_observable.dart
rename to lib/src/observables/observables/observable_map.dart
index 595d33f..e1e799c 100644
--- a/lib/src/observables/observables/map_observable.dart
+++ b/lib/src/observables/observables/observable_map.dart
@@ -6,9 +6,9 @@ import 'observable.dart';
 import '../observers/observer.dart';
 
 @internal
-class MapObservable<T, R> implements Observable<R> {
+class ObservableMap<T, R> implements Observable<R> {
   
-  const MapObservable({
+  const ObservableMap({
     required R Function(T) convert,
     required Observable<T> child,
   }): _convert = convert,
diff --git a/lib/src/observables/observables/multicast_observable.dart b/lib/src/observables/observables/observable_multicast.dart
similarity index 94%
rename from lib/src/observables/observables/multicast_observable.dart
rename to lib/src/observables/observables/observable_multicast.dart
index eaa3d76..131ab3e 100644
--- a/lib/src/observables/observables/multicast_observable.dart
+++ b/lib/src/observables/observables/observable_multicast.dart
@@ -8,9 +8,9 @@ import '../subjects/subject.dart';
 import '../subjects/publish_subject.dart';
 
 @internal
-class MulticastObservable<T> implements Observable<T> {
+class ObservableMulticast<T> implements Observable<T> {
 
-  MulticastObservable({
+  ObservableMulticast({
     Subject<T> Function()? createSubject,
     required Observable<T> child,
   }): _createSubject = createSubject ?? _defaultCreateSubject,
diff --git a/lib/src/observables/observables/skip_observable.dart b/lib/src/observables/observables/observable_skip.dart
similarity index 87%
rename from lib/src/observables/observables/skip_observable.dart
rename to lib/src/observables/observables/observable_skip.dart
index 4764f55..95bcb47 100644
--- a/lib/src/observables/observables/skip_observable.dart
+++ b/lib/src/observables/observables/observable_skip.dart
@@ -6,9 +6,9 @@ import 'observable.dart';
 import '../observers/observer.dart';
 
 @internal
-class SkipObservable<T> implements Observable<T> {
+class ObservableSkip<T> implements Observable<T> {
 
-  const SkipObservable({
+  const ObservableSkip({
     required int n,
     required Observable<T> child,
   }): _n = n,
diff --git a/lib/src/observables/observables/where_observable.dart b/lib/src/observables/observables/observable_where.dart
similarity index 87%
rename from lib/src/observables/observables/where_observable.dart
rename to lib/src/observables/observables/observable_where.dart
index 0d0edea..c9a58f8 100644
--- a/lib/src/observables/observables/where_observable.dart
+++ b/lib/src/observables/observables/observable_where.dart
@@ -6,9 +6,9 @@ import '../observers/observer.dart';
 import 'observable.dart';
 
 @internal
-class WhereObservable<T> implements Observable<T> {
+class ObservableWhere<T> implements Observable<T> {
 
-  const WhereObservable({
+  const ObservableWhere({
     required bool Function(T) test,
     required Observable<T> child,
   }): _test = test,