diff --git a/ubisync-lib/src/types/element.rs b/ubisync-lib/src/types/element.rs
index 7475a10..bf24e4e 100644
--- a/ubisync-lib/src/types/element.rs
+++ b/ubisync-lib/src/types/element.rs
@@ -8,13 +8,13 @@ pub struct Element {
     pub id: ElementId,
     pub pot: Option<PotId>,
     pub content: ElementContent,
-    pub update_strategy: ElementUpdateStrategy,
+    pub update_strategy: ContentUpdateStrategy,
     pub latest_message: Option<MessageId>,
     pub local_changes: bool,
 }
 
 impl Element {
-    pub fn new(id: ElementId, content: ElementContent, update_strategy: ElementUpdateStrategy) -> Self {
+    pub fn new(id: ElementId, content: ElementContent, update_strategy: ContentUpdateStrategy) -> Self {
         // A new element with no latest message must have local changes
         Element {
             id: id,
@@ -46,11 +46,11 @@ impl Element {
 
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
-pub enum ElementUpdateStrategy {
+pub enum ContentUpdateStrategy {
     Overwrite
 }
 
-impl ElementUpdateStrategy {
+impl ContentUpdateStrategy {
     pub fn default_by_content(&self, content: &ElementContent) -> Self {
         match content {
             _ => Self::Overwrite,
@@ -58,7 +58,7 @@ impl ElementUpdateStrategy {
     }
 }
 
-impl Default for ElementUpdateStrategy {
+impl Default for ContentUpdateStrategy {
     fn default() -> Self {
         Self::Overwrite
     }
diff --git a/ubisync-lib/src/types/mod.rs b/ubisync-lib/src/types/mod.rs
index f256046..ecdda15 100644
--- a/ubisync-lib/src/types/mod.rs
+++ b/ubisync-lib/src/types/mod.rs
@@ -8,7 +8,7 @@ mod element_id;
 pub use element_id::ElementId;
 
 mod element;
-pub use element::{Element, ElementUpdateStrategy};
+pub use element::{Element, ContentUpdateStrategy};
 
 mod family_id;
 pub use family_id::FamilyId;
diff --git a/ubisync/src/comm/message_processor.rs b/ubisync/src/comm/message_processor.rs
index 231b349..93c2c28 100644
--- a/ubisync/src/comm/message_processor.rs
+++ b/ubisync/src/comm/message_processor.rs
@@ -1,7 +1,7 @@
 use tracing::debug;
 
 use ubisync_lib::peer::Peer;
-use ubisync_lib::types::{ElementUpdateStrategy, PeerId};
+use ubisync_lib::types::{ContentUpdateStrategy, PeerId};
 
 use ubisync_lib::messages::{Message, MessageContent};
 
@@ -20,7 +20,7 @@ pub fn handle(state: &CommState, peer: &PeerId, message: Message) {
                 .add_received_element(
                     id.to_owned(),
                     content.to_owned(),
-                    ElementUpdateStrategy::Overwrite,
+                    ContentUpdateStrategy::Overwrite,
                     Some(message.id().to_owned()),
                     pot.to_owned(),
                 )
diff --git a/ubisync/src/state/api_state.rs b/ubisync/src/state/api_state.rs
index 0e7aead..9d0e9aa 100644
--- a/ubisync/src/state/api_state.rs
+++ b/ubisync/src/state/api_state.rs
@@ -6,7 +6,7 @@ use tracing::debug;
 use ubisync_lib::{
     api::events::AppEvent,
     messages::MessageContent,
-    types::{AppId, Element, ElementContent, ElementId, ElementUpdateStrategy, Pot, PotId},
+    types::{AppId, Element, ElementContent, ElementId, ContentUpdateStrategy, Pot, PotId},
 };
 
 use crate::api::v0::app::App;
@@ -60,7 +60,7 @@ impl ApiState {
     pub fn create_element(&self, content: ElementContent, pot: PotId) -> anyhow::Result<ElementId> {
         let id = ElementId::new();
         self.db()
-            .add_element(id.clone(), content.clone(), ElementUpdateStrategy::Overwrite, None, false, pot.clone())?;
+            .add_element(id.clone(), content.clone(), ContentUpdateStrategy::Overwrite, None, false, pot.clone())?;
         debug!("Added element {{{}}}", id.to_string());
 
         self.state.send_to_peers(
diff --git a/ubisync/src/state/comm_state.rs b/ubisync/src/state/comm_state.rs
index 5c0d442..dd85674 100644
--- a/ubisync/src/state/comm_state.rs
+++ b/ubisync/src/state/comm_state.rs
@@ -5,7 +5,7 @@ use tracing::debug;
 use ubisync_lib::{
     api::events::AppEvent,
     peer::Peer,
-    types::{Element, ElementContent, ElementId, ElementUpdateStrategy, MessageId, PotId},
+    types::{Element, ElementContent, ElementId, ContentUpdateStrategy, MessageId, PotId},
 };
 
 use crate::node_events::UbisyncNodeEvent;
@@ -25,7 +25,7 @@ impl CommState {
         &self,
         id: ElementId,
         content: ElementContent,
-        update_strategy: ElementUpdateStrategy,
+        update_strategy: ContentUpdateStrategy,
         latest_message: Option<MessageId>,
         pot_id: PotId,
     ) -> anyhow::Result<()> {
@@ -110,7 +110,7 @@ mod tests {
     use super::CommState;
 
     use tracing::Level;
-    use ubisync_lib::types::{ElementContent, ElementId, ElementUpdateStrategy, MessageId, PotId};
+    use ubisync_lib::types::{ElementContent, ElementId, ContentUpdateStrategy, MessageId, PotId};
 
     #[tokio::test]
     #[serial_test::serial]
@@ -127,7 +127,7 @@ mod tests {
             .add_received_element(
                 id.clone(),
                 ElementContent::Text("Test-text".to_string()),
-                ElementUpdateStrategy::Overwrite,
+                ContentUpdateStrategy::Overwrite,
                 Some(MessageId::new()),
                 pot_id,
             )
@@ -154,7 +154,7 @@ mod tests {
             .add_received_element(
                 id.clone(),
                 ElementContent::Text("Test-text".to_string()),
-                ElementUpdateStrategy::Overwrite,
+                ContentUpdateStrategy::Overwrite,
                 Some(MessageId::new()),
                 pot_id,
             )
diff --git a/ubisync/src/state/database/collections/apps.rs b/ubisync/src/state/database/collections/apps.rs
index 678727d..ae8fe46 100644
--- a/ubisync/src/state/database/collections/apps.rs
+++ b/ubisync/src/state/database/collections/apps.rs
@@ -113,7 +113,7 @@ impl StateDB {
 
 #[cfg(test)]
 mod tests {
-    use ubisync_lib::types::{AppId, ElementContent, ElementId, ElementUpdateStrategy, Pot, PotId};
+    use ubisync_lib::types::{AppId, ElementContent, ElementId, ContentUpdateStrategy, Pot, PotId};
 
     use crate::{api::v0::app::App, state::database::StateDB};
 
@@ -259,7 +259,7 @@ mod tests {
         db.add_element(
             element_id.clone(),
             ElementContent::Text("Text".to_string()),
-            ElementUpdateStrategy::Overwrite,
+            ContentUpdateStrategy::Overwrite,
             None,
             false,
             pot_id.clone(),
diff --git a/ubisync/src/state/database/collections/elements.rs b/ubisync/src/state/database/collections/elements.rs
index 9b24919..6b2129d 100644
--- a/ubisync/src/state/database/collections/elements.rs
+++ b/ubisync/src/state/database/collections/elements.rs
@@ -1,7 +1,7 @@
 use anyhow::{anyhow, Error};
 use bonsaidb::core::schema::{Collection, SerializedCollection};
 use serde::{Deserialize, Serialize};
-use ubisync_lib::types::{Element, ElementContent, ElementId, ElementUpdateStrategy, MessageId, PotId};
+use ubisync_lib::types::{Element, ElementContent, ElementId, ContentUpdateStrategy, MessageId, PotId};
 
 use crate::state::database::{as_key::AsKey, StateDB};
 
@@ -11,7 +11,7 @@ pub(super) struct DbElement {
     #[natural_id]
     pub(super) id: AsKey<ElementId>,
     pub(super) content: ElementContent,
-    pub(super) update_strategy: ElementUpdateStrategy,
+    pub(super) update_strategy: ContentUpdateStrategy,
     pub(super) latest_message: Option<MessageId>,
     pub(super) local_changes: bool,
     pub(super) pot: PotId,
@@ -35,7 +35,7 @@ impl StateDB {
         &self,
         id: ElementId,
         content: ElementContent,
-        update_strategy: ElementUpdateStrategy,
+        update_strategy: ContentUpdateStrategy,
         latest_message: Option<MessageId>,
         local_changes: bool,
         pot: PotId,
@@ -108,7 +108,7 @@ impl StateDB {
 
 #[cfg(test)]
 mod tests {
-    use ubisync_lib::types::{Element, ElementContent, ElementId, ElementUpdateStrategy, MessageId, PotId};
+    use ubisync_lib::types::{Element, ElementContent, ElementId, ContentUpdateStrategy, MessageId, PotId};
 
     use crate::state::database::StateDB;
 
@@ -120,7 +120,7 @@ mod tests {
         db.add_element(
             element_id.clone(),
             ElementContent::Text("Content!!!".to_string()),
-            ElementUpdateStrategy::default(),
+            ContentUpdateStrategy::default(),
             None,
             false,
             pot_id.clone(),
@@ -134,7 +134,7 @@ mod tests {
                 Element {
                     id: element_id,
                     content: ElementContent::Text("Content!!!".to_string()),
-                    update_strategy: ElementUpdateStrategy::default(),
+                    update_strategy: ContentUpdateStrategy::default(),
                     latest_message: None,
                     local_changes: false,
                     pot: Some(pot_id),
@@ -151,7 +151,7 @@ mod tests {
         db.add_element(
             element_id.clone(),
             ElementContent::Text("Content!!!".to_string()),
-            ElementUpdateStrategy::default(),
+            ContentUpdateStrategy::default(),
             None,
             false,
             PotId::new(),
@@ -177,7 +177,7 @@ mod tests {
         db.add_element(
             element_id.clone(),
             ElementContent::Text("Content!!!".to_string()),
-            ElementUpdateStrategy::default(),
+            ContentUpdateStrategy::default(),
             None,
             false,
             PotId::new(),
@@ -213,7 +213,7 @@ mod tests {
         db.add_element(
             element_id.clone(),
             ElementContent::Text("Content!!!".to_string()),
-            ElementUpdateStrategy::default(),
+            ContentUpdateStrategy::default(),
             None,
             false,
             PotId::new(),