diff --git a/include/ureact/adaptor/adjacent.hpp b/include/ureact/adaptor/adjacent.hpp
index f2c72c8..9c1e61b 100644
--- a/include/ureact/adaptor/adjacent.hpp
+++ b/include/ureact/adaptor/adjacent.hpp
@@ -19,7 +19,7 @@ namespace detail
 {
 
 template <size_t N>
-struct AdjacentClosure : AdaptorClosure
+struct AdjacentClosure : adaptor_closure
 {
     static_assert( N >= 1 );
 
diff --git a/include/ureact/adaptor/adjacent_filter.hpp b/include/ureact/adaptor/adjacent_filter.hpp
index eb2b045..f7dc791 100644
--- a/include/ureact/adaptor/adjacent_filter.hpp
+++ b/include/ureact/adaptor/adjacent_filter.hpp
@@ -19,7 +19,7 @@ namespace detail
 {
 
 template <size_t N>
-struct AdjacentFilterAdaptor : Adaptor
+struct AdjacentFilterAdaptor : adaptor
 {
     static_assert( N >= 1 );
 
diff --git a/include/ureact/adaptor/adjacent_transform.hpp b/include/ureact/adaptor/adjacent_transform.hpp
index d4e2d02..0fefd15 100644
--- a/include/ureact/adaptor/adjacent_transform.hpp
+++ b/include/ureact/adaptor/adjacent_transform.hpp
@@ -19,7 +19,7 @@ namespace detail
 {
 
 template <size_t N>
-struct AdjacentTransformAdaptor : Adaptor
+struct AdjacentTransformAdaptor : adaptor
 {
     static_assert( N >= 1 );
 
diff --git a/include/ureact/adaptor/changed_to.hpp b/include/ureact/adaptor/changed_to.hpp
index 97607cc..ba6d88c 100644
--- a/include/ureact/adaptor/changed_to.hpp
+++ b/include/ureact/adaptor/changed_to.hpp
@@ -20,7 +20,7 @@ UREACT_BEGIN_NAMESPACE
 namespace detail
 {
 
-struct ChangedToAdaptor : Adaptor
+struct ChangedToAdaptor : adaptor
 {
     template <typename V, typename S = std::decay_t<V>>
     UREACT_WARN_UNUSED_RESULT constexpr auto operator()( const signal<S>& target, V&& value ) const
diff --git a/include/ureact/adaptor/collect.hpp b/include/ureact/adaptor/collect.hpp
index 657c471..dcbf58a 100644
--- a/include/ureact/adaptor/collect.hpp
+++ b/include/ureact/adaptor/collect.hpp
@@ -20,7 +20,7 @@ namespace detail
 {
 
 template <template <typename...> class ContT>
-struct CollectClosure : AdaptorClosure
+struct CollectClosure : adaptor_closure
 {
     /*!
 	 * @brief Collects received events into signal<ContT<E>>
diff --git a/include/ureact/adaptor/enumerate.hpp b/include/ureact/adaptor/enumerate.hpp
index 2075bc0..7a5d1fd 100644
--- a/include/ureact/adaptor/enumerate.hpp
+++ b/include/ureact/adaptor/enumerate.hpp
@@ -19,7 +19,7 @@ UREACT_BEGIN_NAMESPACE
 namespace detail
 {
 
-struct EnumerateAdaptorClosure : AdaptorClosure
+struct EnumerateAdaptorClosure : adaptor_closure
 {
     template <typename E>
     UREACT_WARN_UNUSED_RESULT constexpr auto operator()( const events<E>& source ) const
diff --git a/include/ureact/adaptor/flatten.hpp b/include/ureact/adaptor/flatten.hpp
index 40ce3e1..22128a1 100644
--- a/include/ureact/adaptor/flatten.hpp
+++ b/include/ureact/adaptor/flatten.hpp
@@ -117,7 +117,7 @@ class event_flatten_node final : public event_stream_node<InnerE>
     std::shared_ptr<event_stream_node<InnerE>> m_inner;
 };
 
-struct FlattenClosure : AdaptorClosure
+struct FlattenClosure : adaptor_closure
 {
     /*!
 	 * @brief Create a new event stream by flattening a signal
diff --git a/include/ureact/adaptor/fold.hpp b/include/ureact/adaptor/fold.hpp
index 21528ac..6bc5c43 100644
--- a/include/ureact/adaptor/fold.hpp
+++ b/include/ureact/adaptor/fold.hpp
@@ -141,7 +141,7 @@ class fold_node final : public signal_node<S>
     signal_pack<Deps...> m_deps;
 };
 
-struct FoldAdaptor : Adaptor
+struct FoldAdaptor : adaptor
 {
     /*!
 	 * @brief Folds values from an event stream into a signal
diff --git a/include/ureact/adaptor/hold.hpp b/include/ureact/adaptor/hold.hpp
index c8c3da1..f64d53d 100644
--- a/include/ureact/adaptor/hold.hpp
+++ b/include/ureact/adaptor/hold.hpp
@@ -18,7 +18,7 @@ UREACT_BEGIN_NAMESPACE
 namespace detail
 {
 
-struct HoldAdaptor : Adaptor
+struct HoldAdaptor : adaptor
 {
     /*!
 	 * @brief Holds the most recent event in a signal
diff --git a/include/ureact/adaptor/join.hpp b/include/ureact/adaptor/join.hpp
index 539f4c4..135c9e2 100644
--- a/include/ureact/adaptor/join.hpp
+++ b/include/ureact/adaptor/join.hpp
@@ -18,7 +18,7 @@ UREACT_BEGIN_NAMESPACE
 namespace detail
 {
 
-struct JoinClosure : AdaptorClosure
+struct JoinClosure : adaptor_closure
 {
     /*!
 	 * @brief Emits the sequence obtained from flattening received event value
diff --git a/include/ureact/adaptor/join_with.hpp b/include/ureact/adaptor/join_with.hpp
index 9859a4d..7508c42 100644
--- a/include/ureact/adaptor/join_with.hpp
+++ b/include/ureact/adaptor/join_with.hpp
@@ -18,7 +18,7 @@ UREACT_BEGIN_NAMESPACE
 namespace detail
 {
 
-struct JoinWithAdaptor : Adaptor
+struct JoinWithAdaptor : adaptor
 {
     /*!
 	 * @brief Emits the sequence obtained from flattening received event value, with the delimiter in between elements
diff --git a/include/ureact/adaptor/lift.hpp b/include/ureact/adaptor/lift.hpp
index 6f6eb24..32f0cd7 100644
--- a/include/ureact/adaptor/lift.hpp
+++ b/include/ureact/adaptor/lift.hpp
@@ -93,7 +93,7 @@ struct unary_plus
 };
 
 template <typename SIn = void>
-struct LiftAdaptor : Adaptor
+struct LiftAdaptor : adaptor
 {
 
     /*!
diff --git a/include/ureact/adaptor/merge.hpp b/include/ureact/adaptor/merge.hpp
index 10df140..12328c7 100644
--- a/include/ureact/adaptor/merge.hpp
+++ b/include/ureact/adaptor/merge.hpp
@@ -57,7 +57,7 @@ class event_merge_node final : public event_stream_node<E>
 };
 
 template <typename EIn = void>
-struct MergeAdaptor : Adaptor
+struct MergeAdaptor : adaptor
 {
     /// TODO: rewrite to something more sane. Unfortunately conditional_t doesn't work
     template <typename... Sources>
diff --git a/include/ureact/adaptor/monitor.hpp b/include/ureact/adaptor/monitor.hpp
index 5e86780..10c4d3d 100644
--- a/include/ureact/adaptor/monitor.hpp
+++ b/include/ureact/adaptor/monitor.hpp
@@ -46,7 +46,7 @@ class monitor_node final : public event_stream_node<S>
     signal<S> m_target;
 };
 
-struct MonitorClosure : AdaptorClosure
+struct MonitorClosure : adaptor_closure
 {
     /*!
 	 * @brief Emits value changes of signal as events
diff --git a/include/ureact/adaptor/monitor_change.hpp b/include/ureact/adaptor/monitor_change.hpp
index 47e36d9..5e8d95c 100644
--- a/include/ureact/adaptor/monitor_change.hpp
+++ b/include/ureact/adaptor/monitor_change.hpp
@@ -19,7 +19,7 @@ UREACT_BEGIN_NAMESPACE
 namespace detail
 {
 
-struct MonitorChangeClosure : AdaptorClosure
+struct MonitorChangeClosure : adaptor_closure
 {
     /*!
 	 * @brief Emits pairs of value changes of signal as events
diff --git a/include/ureact/adaptor/observe.hpp b/include/ureact/adaptor/observe.hpp
index e660196..46843ca 100644
--- a/include/ureact/adaptor/observe.hpp
+++ b/include/ureact/adaptor/observe.hpp
@@ -296,7 +296,7 @@ auto observe_events_impl(
         context, subject, std::forward<InF>( func ), dep_pack );
 }
 
-struct ObserveAdaptor : Adaptor
+struct ObserveAdaptor : adaptor
 {
     /*!
 	 * @brief Create observer for signal
diff --git a/include/ureact/adaptor/process.hpp b/include/ureact/adaptor/process.hpp
index 30f11f4..c048ca7 100644
--- a/include/ureact/adaptor/process.hpp
+++ b/include/ureact/adaptor/process.hpp
@@ -73,7 +73,7 @@ class event_processing_node final : public event_stream_node<OutE>
 };
 
 template <typename OutE>
-struct ProcessAdaptor : Adaptor
+struct ProcessAdaptor : adaptor
 {
     /*!
 	 * @brief Create a new event stream by batch processing events from other stream
diff --git a/include/ureact/adaptor/pulse.hpp b/include/ureact/adaptor/pulse.hpp
index e9213b2..d179ab3 100644
--- a/include/ureact/adaptor/pulse.hpp
+++ b/include/ureact/adaptor/pulse.hpp
@@ -18,7 +18,7 @@ UREACT_BEGIN_NAMESPACE
 namespace detail
 {
 
-struct PulseAdaptor : Adaptor
+struct PulseAdaptor : adaptor
 {
     /*!
 	 * @brief Emits the value of a target signal when an event is received
diff --git a/include/ureact/adaptor/reactive_ref.hpp b/include/ureact/adaptor/reactive_ref.hpp
index 164341b..9690fc8 100644
--- a/include/ureact/adaptor/reactive_ref.hpp
+++ b/include/ureact/adaptor/reactive_ref.hpp
@@ -48,7 +48,7 @@ struct decay_input<member_var_signal<Owner, S>>
 template <typename T>
 using decay_input_t = typename decay_input<T>::type;
 
-struct ReactiveRefAdaptor : Adaptor
+struct ReactiveRefAdaptor : adaptor
 {
     /*!
 	 * @brief Adaptor to flatten public signal attribute of class pointed be reference
diff --git a/include/ureact/adaptor/slice.hpp b/include/ureact/adaptor/slice.hpp
index 89ef037..f94f89c 100644
--- a/include/ureact/adaptor/slice.hpp
+++ b/include/ureact/adaptor/slice.hpp
@@ -22,7 +22,7 @@ UREACT_BEGIN_NAMESPACE
 namespace detail
 {
 
-struct SliceAdaptor : Adaptor
+struct SliceAdaptor : adaptor
 {
     /*!
 	 * @brief Keeps given range (begin through end-1) of elements from the source stream
diff --git a/include/ureact/adaptor/snapshot.hpp b/include/ureact/adaptor/snapshot.hpp
index 4dff26d..12c1ffc 100644
--- a/include/ureact/adaptor/snapshot.hpp
+++ b/include/ureact/adaptor/snapshot.hpp
@@ -18,7 +18,7 @@ UREACT_BEGIN_NAMESPACE
 namespace detail
 {
 
-struct SnapshotAdaptor : Adaptor
+struct SnapshotAdaptor : adaptor
 {
     /*!
 	 * @brief Sets the signal value to the value of a target signal when an event is received
diff --git a/include/ureact/adaptor/stride.hpp b/include/ureact/adaptor/stride.hpp
index 9f2462f..c21d405 100644
--- a/include/ureact/adaptor/stride.hpp
+++ b/include/ureact/adaptor/stride.hpp
@@ -21,7 +21,7 @@ UREACT_BEGIN_NAMESPACE
 namespace detail
 {
 
-struct StrideAdaptor : Adaptor
+struct StrideAdaptor : adaptor
 {
     /*!
 	 * @brief Advances N elements from the source stream at a time
diff --git a/include/ureact/adaptor/tap.hpp b/include/ureact/adaptor/tap.hpp
index 700ca5b..f1ad0a4 100644
--- a/include/ureact/adaptor/tap.hpp
+++ b/include/ureact/adaptor/tap.hpp
@@ -78,7 +78,7 @@ class event_tap_node final : public event_stream_node<E>
     observer m_observer;
 };
 
-struct TapAdaptor : Adaptor
+struct TapAdaptor : adaptor
 {
     /*!
 	 * @brief Create tapped copy for observed signal
diff --git a/include/ureact/adaptor/zip.hpp b/include/ureact/adaptor/zip.hpp
index 5f3ceef..05c019b 100644
--- a/include/ureact/adaptor/zip.hpp
+++ b/include/ureact/adaptor/zip.hpp
@@ -18,7 +18,7 @@ UREACT_BEGIN_NAMESPACE
 namespace detail
 {
 
-struct ZipAdaptor : Adaptor
+struct ZipAdaptor : adaptor
 {
     /*!
 	 * @brief Emit a tuple (e1,…,eN) for each complete set of values for sources 1...N
diff --git a/include/ureact/adaptor/zip_transform.hpp b/include/ureact/adaptor/zip_transform.hpp
index 8b843cc..e33f786 100644
--- a/include/ureact/adaptor/zip_transform.hpp
+++ b/include/ureact/adaptor/zip_transform.hpp
@@ -18,7 +18,7 @@ UREACT_BEGIN_NAMESPACE
 namespace detail
 {
 
-struct ZipTransformAdaptor : Adaptor
+struct ZipTransformAdaptor : adaptor
 {
     /*!
 	 * @brief Emit an invoke result for func(e1,…,eN) for each complete set of values for sources 1...N
diff --git a/include/ureact/detail/adaptor.hpp b/include/ureact/detail/adaptor.hpp
index c9ab206..3eda566 100644
--- a/include/ureact/detail/adaptor.hpp
+++ b/include/ureact/detail/adaptor.hpp
@@ -22,16 +22,16 @@ namespace detail
 {
 
 // Forward
-struct AdaptorClosure;
+struct adaptor_closure;
 
 template <typename Lhs, typename Rhs>
-class Pipe;
+class pipe;
 
 /*!
  * @brief Return if type is closure
  */
 template <typename T>
-struct is_closure : std::is_base_of<AdaptorClosure, remove_cvref_t<T>>
+struct is_closure : std::is_base_of<adaptor_closure, remove_cvref_t<T>>
 {};
 
 /*!
@@ -59,7 +59,7 @@ inline constexpr bool is_closure_v = is_closure<T>::value;
  *
  * @note similar to https://en.cppreference.com/w/cpp/ranges#Range_adaptor_closure_objects
  */
-struct AdaptorClosure
+struct adaptor_closure
 {
     /// chain two closures to make another one
     template <typename Lhs,
@@ -68,7 +68,7 @@ struct AdaptorClosure
         class = std::enable_if_t<is_closure_v<Rhs>>>
     UREACT_WARN_UNUSED_RESULT friend constexpr auto operator|( Lhs lhs, Rhs rhs )
     {
-        return Pipe<Lhs, Rhs>{ std::move( lhs ), std::move( rhs ) };
+        return pipe<Lhs, Rhs>{ std::move( lhs ), std::move( rhs ) };
     }
 
     /// apply arg to given closure and return its result
@@ -85,10 +85,10 @@ struct AdaptorClosure
 
 /// Composition of the adaptor closures Lhs and Rhs.
 template <typename Lhs, typename Rhs>
-class Pipe : public AdaptorClosure
+class pipe : public adaptor_closure
 {
 public:
-    constexpr Pipe( Lhs lhs, Rhs rhs )
+    constexpr pipe( Lhs lhs, Rhs rhs )
         : m_lhs( std::move( lhs ) )
         , m_rhs( std::move( rhs ) )
     {}
@@ -115,10 +115,10 @@ class Pipe : public AdaptorClosure
 
 /// Partial application of the adaptor
 template <typename Adaptor, typename... Args>
-class Partial : public AdaptorClosure
+class partial : public adaptor_closure
 {
 public:
-    constexpr explicit Partial( Args... args )
+    constexpr explicit partial( Args... args )
         : m_args( std::move( args )... )
     {}
 
@@ -154,13 +154,13 @@ class Partial : public AdaptorClosure
  *  
  *  Equivalent of "Range adaptors" from std ranges library
  */
-struct Adaptor
+struct adaptor
 {
 protected:
     template <typename Derived, typename... Args>
     static constexpr auto make_partial( Args&&... args )
     {
-        return Partial<Derived, std::decay_t<Args>...>{ std::forward<Args>( args )... };
+        return partial<Derived, std::decay_t<Args>...>{ std::forward<Args>( args )... };
     }
 };
 
diff --git a/include/ureact/detail/synced_adaptor_base.hpp b/include/ureact/detail/synced_adaptor_base.hpp
index 067b35a..a79b4d6 100644
--- a/include/ureact/detail/synced_adaptor_base.hpp
+++ b/include/ureact/detail/synced_adaptor_base.hpp
@@ -19,7 +19,7 @@ namespace detail
 {
 
 template <typename Derived>
-struct SyncedAdaptorBase : Adaptor
+struct SyncedAdaptorBase : adaptor
 {
     template <typename E, typename F>
     UREACT_WARN_UNUSED_RESULT constexpr auto operator()( const events<E>& source, F&& func ) const
diff --git a/include/ureact/detail/take_drop_base.hpp b/include/ureact/detail/take_drop_base.hpp
index 6679a1e..6adf69c 100644
--- a/include/ureact/detail/take_drop_base.hpp
+++ b/include/ureact/detail/take_drop_base.hpp
@@ -67,7 +67,7 @@ class countdown
 };
 
 template <typename Derived>
-struct TakeDropAdaptorBase : Adaptor
+struct TakeDropAdaptorBase : adaptor
 {
     template <typename N, class = std::enable_if_t<std::is_integral_v<N>>>
     UREACT_WARN_UNUSED_RESULT constexpr auto operator()( const N count ) const