diff --git a/docs/book/src/element_parameters.md b/docs/book/src/element_parameters.md
index 94deb7a..1f292e1 100644
--- a/docs/book/src/element_parameters.md
+++ b/docs/book/src/element_parameters.md
@@ -9,7 +9,7 @@ function [`use_element_size`](elements/use_element_size.md) returns the width an
 #
 # #[component]
 # pub fn Component() -> impl IntoView {
-let el = create_node_ref::<Div>();
+let el = NodeRef::<Div>::new();
 
 let UseElementSizeReturn { width, height } = use_element_size(el);
 
@@ -78,8 +78,8 @@ use_resize_observer([window().body(), document().query_selector("div > p.some-cl
 use_resize_observer(vec!["div > p.some-class", "p.some-class"]);
 
 // Slice of NodeRef
-let node_ref1 = create_node_ref::<Div>();
-let node_ref2 = create_node_ref::<Div>();
+let node_ref1 = NodeRef::<Div>::new();
+let node_ref2 = NodeRef::<Div>::new();
 use_resize_observer(vec![node_ref1, node_ref2].as_slice());
 ```
 
diff --git a/src/use_drop_zone.rs b/src/use_drop_zone.rs
index d64a907..2c3ad99 100644
--- a/src/use_drop_zone.rs
+++ b/src/use_drop_zone.rs
@@ -26,7 +26,7 @@ cfg_if! { if #[cfg(not(feature = "ssr"))] {
 /// #
 /// # #[component]
 /// # fn Demo() -> impl IntoView {
-/// let drop_zone_el = create_node_ref::<Div>();
+/// let drop_zone_el = NodeRef::<Div>::new();
 ///
 /// let on_drop = |event| {
 ///     // called when files are dropped on zone
diff --git a/src/use_element_bounding.rs b/src/use_element_bounding.rs
index ac31381..90a7b8c 100644
--- a/src/use_element_bounding.rs
+++ b/src/use_element_bounding.rs
@@ -19,7 +19,7 @@ use leptos::prelude::*;
 /// #
 /// # #[component]
 /// # fn Demo() -> impl IntoView {
-/// let el = create_node_ref::<Div>();
+/// let el = NodeRef::<Div>::new();
 /// let UseElementBoundingReturn {
 ///     x, y, top,right,bottom,left, width, height, ..
 /// } = use_element_bounding(el);
diff --git a/src/use_element_hover.rs b/src/use_element_hover.rs
index 0054ca7..b865519 100644
--- a/src/use_element_hover.rs
+++ b/src/use_element_hover.rs
@@ -26,7 +26,7 @@ cfg_if! { if #[cfg(not(feature = "ssr"))] {
 /// #
 /// # #[component]
 /// # fn Demo() -> impl IntoView {
-/// let el = create_node_ref::<Button>();
+/// let el = NodeRef::<Button>::new();
 /// let is_hovered = use_element_hover(el);
 ///
 /// view! {
diff --git a/src/use_element_visibility.rs b/src/use_element_visibility.rs
index 5240ef1..90020cb 100644
--- a/src/use_element_visibility.rs
+++ b/src/use_element_visibility.rs
@@ -23,7 +23,7 @@ use leptos::prelude::wrappers::read::Signal;
 /// #
 /// # #[component]
 /// # fn Demo() -> impl IntoView {
-/// let el = create_node_ref::<Div>();
+/// let el = NodeRef::<Div>::new();
 ///
 /// let is_visible = use_element_visibility(el);
 ///
diff --git a/src/use_event_listener.rs b/src/use_event_listener.rs
index 5f581fc..366a3c0 100644
--- a/src/use_event_listener.rs
+++ b/src/use_event_listener.rs
@@ -44,7 +44,7 @@ cfg_if! { if #[cfg(not(feature = "ssr"))] {
 /// #
 /// # #[component]
 /// # fn Demo() -> impl IntoView {
-/// let element = create_node_ref();
+/// let element = NodeRef::new();
 ///
 /// use_event_listener(element, click, |evt| {
 ///     log!("click from element {:?}", event_target::<web_sys::HtmlDivElement>(&evt));
diff --git a/src/use_infinite_scroll.rs b/src/use_infinite_scroll.rs
index 32b9eff..10fc1c8 100644
--- a/src/use_infinite_scroll.rs
+++ b/src/use_infinite_scroll.rs
@@ -28,7 +28,7 @@ use wasm_bindgen::JsCast;
 /// #
 /// # #[component]
 /// # fn Demo() -> impl IntoView {
-/// let el = create_node_ref::<Div>();
+/// let el = NodeRef::<Div>::new();
 ///
 /// let (data, set_data) = signal(vec![1, 2, 3, 4, 5, 6]);
 ///
diff --git a/src/use_intersection_observer.rs b/src/use_intersection_observer.rs
index 9aebe3a..8720845 100644
--- a/src/use_intersection_observer.rs
+++ b/src/use_intersection_observer.rs
@@ -30,7 +30,7 @@ cfg_if! { if #[cfg(not(feature = "ssr"))] {
 /// #
 /// # #[component]
 /// # fn Demo() -> impl IntoView {
-/// let el = create_node_ref::<Div>();
+/// let el = NodeRef::<Div>::new();
 /// let (is_visible, set_visible) = signal(false);
 ///
 /// use_intersection_observer(
diff --git a/src/use_mouse.rs b/src/use_mouse.rs
index 92768ca..c1f6e80 100644
--- a/src/use_mouse.rs
+++ b/src/use_mouse.rs
@@ -72,7 +72,7 @@ use wasm_bindgen::{JsCast, JsValue};
 ///
 /// #[component]
 /// fn Demo() -> impl IntoView {
-///     let element = create_node_ref::<Div>();
+///     let element = NodeRef::<Div>::new();
 ///
 ///     let UseMouseReturn {
 ///         x, y, source_type, ..
diff --git a/src/use_mouse_in_element.rs b/src/use_mouse_in_element.rs
index 63f1560..61f02bf 100644
--- a/src/use_mouse_in_element.rs
+++ b/src/use_mouse_in_element.rs
@@ -24,7 +24,7 @@ use std::marker::PhantomData;
 /// #
 /// # #[component]
 /// # fn Demo() -> impl IntoView {
-/// let target = create_node_ref::<Div>();
+/// let target = NodeRef::<Div>::new();
 /// let UseMouseInElementReturn { x, y, is_outside, .. } = use_mouse_in_element(target);
 ///
 /// view! {
diff --git a/src/use_mutation_observer.rs b/src/use_mutation_observer.rs
index eb24c24..23802c0 100644
--- a/src/use_mutation_observer.rs
+++ b/src/use_mutation_observer.rs
@@ -28,7 +28,7 @@ cfg_if! { if #[cfg(not(feature = "ssr"))] {
 /// #
 /// # #[component]
 /// # fn Demo() -> impl IntoView {
-/// let el = create_node_ref::<Pre>();
+/// let el = NodeRef::<Pre>::new();
 /// let (text, set_text) = signal("".to_string());
 ///
 /// use_mutation_observer_with_options(
diff --git a/src/use_scroll.rs b/src/use_scroll.rs
index dc09bdd..6faa594 100644
--- a/src/use_scroll.rs
+++ b/src/use_scroll.rs
@@ -38,7 +38,7 @@ const ARRIVED_STATE_THRESHOLD_PIXELS: f64 = 1.0;
 /// #
 /// # #[component]
 /// # fn Demo() -> impl IntoView {
-/// let element = create_node_ref::<Div>();
+/// let element = NodeRef::<Div>::new();
 ///
 /// let UseScrollReturn {
 ///     x, y, set_x, set_y, is_scrolling, arrived_state, directions, ..
@@ -63,7 +63,7 @@ const ARRIVED_STATE_THRESHOLD_PIXELS: f64 = 1.0;
 /// #
 /// # #[component]
 /// # fn Demo() -> impl IntoView {
-/// # let element = create_node_ref::<Div>();
+/// # let element = NodeRef::<Div>::new();
 /// #
 /// let UseScrollReturn {
 ///     x,
@@ -101,7 +101,7 @@ const ARRIVED_STATE_THRESHOLD_PIXELS: f64 = 1.0;
 /// #
 /// # #[component]
 /// # fn Demo() -> impl IntoView {
-/// let element = create_node_ref::<Div>();
+/// let element = NodeRef::<Div>::new();
 ///
 /// let UseScrollReturn {
 ///     x, y, set_x, set_y, ..
@@ -129,7 +129,7 @@ const ARRIVED_STATE_THRESHOLD_PIXELS: f64 = 1.0;
 /// #
 /// # #[component]
 /// # fn Demo() -> impl IntoView {
-/// # let element = create_node_ref::<Div>();
+/// # let element = NodeRef::<Div>::new();
 /// #
 /// let UseScrollReturn {
 ///     x, y, set_x, set_y, ..
@@ -153,7 +153,7 @@ const ARRIVED_STATE_THRESHOLD_PIXELS: f64 = 1.0;
 /// #
 /// # #[component]
 /// # fn Demo() -> impl IntoView {
-/// # let element = create_node_ref::<Div>();
+/// # let element = NodeRef::<Div>::new();
 /// #
 /// let (smooth, set_smooth) = signal(false);
 ///
diff --git a/src/use_websocket.rs b/src/use_websocket.rs
index 11b97de..e12f819 100644
--- a/src/use_websocket.rs
+++ b/src/use_websocket.rs
@@ -168,11 +168,11 @@ use web_sys::{BinaryType, CloseEvent, Event, MessageEvent, WebSocket};
 /// # #[derive(Clone)]
 /// # pub struct WebsocketContext {
 /// #     pub message: Signal<Option<String>>,
-/// #     send: Arc<dyn Fn(&String)>,
+/// #     send: Arc<dyn Fn(&String) + Send + Sync>,
 /// # }
 /// #
 /// # impl WebsocketContext {
-/// #     pub fn new(message: Signal<Option<String>>, send: Arc<dyn Fn(&String)>) -> Self {
+/// #     pub fn new(message: Signal<Option<String>>, send: Arc<dyn Fn(&String) + Send + Sync>) -> Self {
 /// #         Self {
 /// #             message,
 /// #             send,
@@ -231,9 +231,9 @@ pub fn use_websocket<Tx, Rx, C>(
 ) -> UseWebSocketReturn<
     Tx,
     Rx,
-    impl Fn() + Clone + 'static,
-    impl Fn() + Clone + 'static,
-    impl Fn(&Tx) + Clone + 'static,
+    impl Fn() + Clone + Send + Sync + 'static,
+    impl Fn() + Clone + Send + Sync + 'static,
+    impl Fn(&Tx) + Clone + Send + Sync + 'static,
 >
 where
     Tx: Send + Sync + 'static,
@@ -257,9 +257,9 @@ pub fn use_websocket_with_options<Tx, Rx, C>(
 ) -> UseWebSocketReturn<
     Tx,
     Rx,
-    impl Fn() + Clone + 'static,
-    impl Fn() + Clone + 'static,
-    impl Fn(&Tx) + Clone + 'static,
+    impl Fn() + Clone + Send + Sync + 'static,
+    impl Fn() + Clone + Send + Sync + 'static,
+    impl Fn(&Tx) + Clone + Send + Sync + 'static,
 >
 where
     Tx: Send + Sync + 'static,
@@ -700,9 +700,9 @@ pub struct UseWebSocketReturn<Tx, Rx, OpenFn, CloseFn, SendFn>
 where
     Tx: Send + Sync + 'static,
     Rx: Send + Sync + 'static,
-    OpenFn: Fn() + Clone + 'static,
-    CloseFn: Fn() + Clone + 'static,
-    SendFn: Fn(&Tx) + Clone + 'static,
+    OpenFn: Fn() + Clone + Send + Sync + 'static,
+    CloseFn: Fn() + Clone + Send + Sync + 'static,
+    SendFn: Fn(&Tx) + Clone + Send + Sync + 'static,
 {
     /// The current state of the `WebSocket` connection.
     pub ready_state: Signal<ConnectionReadyState>,