diff --git a/acrate_astreams/src/activitystreams/jsonld.rs b/acrate_astreams/src/activitystreams/jsonld.rs
index 39b0a45..1be6df1 100644
--- a/acrate_astreams/src/activitystreams/jsonld.rs
+++ b/acrate_astreams/src/activitystreams/jsonld.rs
@@ -240,11 +240,23 @@ impl StreamsJsonLD<json_ld::Node> for json_ld::Node {
 }
 
 impl StreamsEntity<json_ld::Node> for json_ld::Node {
+	fn activitystreams_names(&self) -> impl Iterator<Item = AResult<LangTriple>> {
+		self.jsonld_iter_value_langstring(
+			iri!("https://www.w3.org/ns/activitystreams#name")
+		)
+	}
+	
 	fn activitystreams_previews(&self) -> impl Iterator<Item = AResult<json_ld::Node>> {
 		self.jsonld_iter_node_entity(
 			iri!("https://www.w3.org/ns/activitystreams#preview")
 		)
 	}
+	
+	fn activitystreams_mediatype(&self) -> Option<AResult<MediaType>> {
+		self.jsonld_any_value_mediatype(
+			iri!("https://www.w3.org/ns/activitystreams#mediaType")
+		)
+	}
 }
 
 impl StreamsLink<json_ld::Node> for json_ld::Node {
@@ -260,18 +272,6 @@ impl StreamsLink<json_ld::Node> for json_ld::Node {
 		)
 	}
 	
-	fn activitystreams_mediatype(&self) -> Option<AResult<MediaType>> {
-		self.jsonld_any_value_mediatype(
-			iri!("https://www.w3.org/ns/activitystreams#mediaType")
-		)
-	}
-	
-	fn activitystreams_names(&self) -> impl Iterator<Item = AResult<LangTriple>> {
-		self.jsonld_iter_value_langstring(
-			iri!("https://www.w3.org/ns/activitystreams#name")
-		)
-	}
-	
 	fn activitystreams_hreflang(&self) -> Option<AResult<LangTagBuf>> {
 		self.jsonld_any_value_langtag(
 			iri!("https://www.w3.org/ns/activitystreams#hreflang")
diff --git a/acrate_astreams/src/activitystreams/mod.rs b/acrate_astreams/src/activitystreams/mod.rs
index 444f85c..63442a4 100644
--- a/acrate_astreams/src/activitystreams/mod.rs
+++ b/acrate_astreams/src/activitystreams/mod.rs
@@ -12,7 +12,7 @@
 //!
 
 use anyhow::Result as AResult;
-use chrono::{DateTime, Local, TimeDelta, Timelike};
+use chrono::{DateTime, Local, TimeDelta};
 use json_ld::Direction;
 use json_ld::syntax::LangTagBuf;
 use mediatype::MediaType;
diff --git a/acrate_astreams/tests/test_activitystreams.rs b/acrate_astreams/tests/test_activitystreams.rs
index cc6aaf2..8a5125f 100644
--- a/acrate_astreams/tests/test_activitystreams.rs
+++ b/acrate_astreams/tests/test_activitystreams.rs
@@ -259,7 +259,7 @@ async fn test_link_media_type() {
 		.expect("Main node was not found");
 	
 	let mediatype = {
-		use acrate_astreams::activitystreams::StreamsLink;
+		use acrate_astreams::activitystreams::StreamsEntity;
 		
 		node.activitystreams_mediatype()
 			.expect("Property `mediaType` was not found")
@@ -277,7 +277,7 @@ async fn test_link_name_value() {
 		.expect("Main node was not found");
 	
 	let names: Vec<LangTriple> = {
-		use acrate_astreams::activitystreams::StreamsLink;
+		use acrate_astreams::activitystreams::StreamsEntity;
 		
 		node.activitystreams_names()
 			.map(|v| v
@@ -302,7 +302,7 @@ async fn test_link_name_lang() {
 		.expect("Main node was not found");
 	
 	let names: Vec<LangTriple> = {
-		use acrate_astreams::activitystreams::StreamsLink;
+		use acrate_astreams::activitystreams::StreamsEntity;
 		
 		node.activitystreams_names()
 			.map(|v| v