diff --git a/nsActivitystreams.go b/nsActivitystreams.go
index d4137a8..0b8bc25 100644
--- a/nsActivitystreams.go
+++ b/nsActivitystreams.go
@@ -6,28 +6,28 @@ import (
 	"gitlab.com/mstarongitlab/goutils/sliceutils"
 )
 
-type ActorData struct {
+type ASActorData struct {
 	FullIdType
 }
 
-func (actor *ActorData) GetSelfOrBase() (BaseApChain, bool) {
+func (actor *ASActorData) GetSelfOrBase() (BaseApChain, bool) {
 	return actor.FullIdType.GetSelfOrBase()
 }
 
-func (actor *ActorData) MarshalToMap() map[string]any {
+func (actor *ASActorData) MarshalToMap() map[string]any {
 	return actor.FullIdType.MarshalToMapWithName(KEY_ACTIVITYSTREAMS_ACTOR)
 }
 
-type AlsoKnownAsData struct {
+type ASAlsoKnownAsData struct {
 	Next BaseApChain
 	Urls []string
 }
 
-func (cc *AlsoKnownAsData) GetSelfOrBase() (BaseApChain, bool) {
+func (cc *ASAlsoKnownAsData) GetSelfOrBase() (BaseApChain, bool) {
 	return cc.Next, true
 }
 
-func (cc *AlsoKnownAsData) MarshalToMap() map[string]any {
+func (cc *ASAlsoKnownAsData) MarshalToMap() map[string]any {
 	return appendWithKey(
 		cc.Next.MarshalToMap(),
 		KEY_ACTIVITYSTREAMS_ALSOKNOWNAS,
@@ -37,16 +37,16 @@ func (cc *AlsoKnownAsData) MarshalToMap() map[string]any {
 	)
 }
 
-type AttachmentsData struct {
+type ASAttachmentsData struct {
 	Next        BaseApChain
 	Attachments []Attachment
 }
 
-func (attachmentsdata *AttachmentsData) GetSelfOrBase() (BaseApChain, bool) {
+func (attachmentsdata *ASAttachmentsData) GetSelfOrBase() (BaseApChain, bool) {
 	return attachmentsdata.Next, true
 }
 
-func (attachmentsdata *AttachmentsData) MarshalToMap() map[string]any {
+func (attachmentsdata *ASAttachmentsData) MarshalToMap() map[string]any {
 	return appendWithKey(
 		attachmentsdata.Next.MarshalToMap(),
 		KEY_ACTIVITYSTREAMS_ATTACHMENTS,
@@ -57,28 +57,28 @@ func (attachmentsdata *AttachmentsData) MarshalToMap() map[string]any {
 	)
 }
 
-type AttributedToData struct {
+type ASAttributedToData struct {
 	FullIdType
 }
 
-func (attributedtodata *AttributedToData) GetSelfOrBase() (BaseApChain, bool) {
+func (attributedtodata *ASAttributedToData) GetSelfOrBase() (BaseApChain, bool) {
 	return attributedtodata.FullIdType.Next, true
 }
 
-func (attributedtodata *AttributedToData) MarshalToMap() map[string]any {
+func (attributedtodata *ASAttributedToData) MarshalToMap() map[string]any {
 	return attributedtodata.FullIdType.MarshalToMapWithName(KEY_ACTIVITYSTREAMS_ATTRIBUTEDTO)
 }
 
-type CCData struct {
+type ASCCData struct {
 	Next    BaseApChain
 	Targets []string
 }
 
-func (cc *CCData) GetSelfOrBase() (BaseApChain, bool) {
+func (cc *ASCCData) GetSelfOrBase() (BaseApChain, bool) {
 	return cc.Next, true
 }
 
-func (cc *CCData) MarshalToMap() map[string]any {
+func (cc *ASCCData) MarshalToMap() map[string]any {
 	return appendWithKey(
 		cc.Next.MarshalToMap(),
 		KEY_ACTIVITYSTREAMS_CC,
@@ -88,18 +88,16 @@ func (cc *CCData) MarshalToMap() map[string]any {
 	)
 }
 
-// Content
-
-type ContentData struct {
+type ASContentData struct {
 	Next    BaseApChain
 	Content []ValueValue[string]
 }
 
-func (contentdata *ContentData) GetSelfOrBase() (BaseApChain, bool) {
+func (contentdata *ASContentData) GetSelfOrBase() (BaseApChain, bool) {
 	return contentdata.Next, true
 }
 
-func (contentdata *ContentData) MarshalToMap() map[string]any {
+func (contentdata *ASContentData) MarshalToMap() map[string]any {
 	return appendWithKey(
 		contentdata.Next.MarshalToMap(),
 		KEY_ACTIVITYSTREAMS_CONTENT,
@@ -109,16 +107,16 @@ func (contentdata *ContentData) MarshalToMap() map[string]any {
 	)
 }
 
-type EndpointsData struct {
+type ASEndpointsData struct {
 	Next      BaseApChain
 	Endpoints map[string]string
 }
 
-func (endpointsdata *EndpointsData) GetSelfOrBase() (BaseApChain, bool) {
+func (endpointsdata *ASEndpointsData) GetSelfOrBase() (BaseApChain, bool) {
 	return endpointsdata.Next, true
 }
 
-func (endpointsdata *EndpointsData) MarshalToMap() map[string]any {
+func (endpointsdata *ASEndpointsData) MarshalToMap() map[string]any {
 	m := endpointsdata.Next.MarshalToMap()
 	arr := []map[string]any{}
 	for k, v := range endpointsdata.Endpoints {
@@ -130,52 +128,52 @@ func (endpointsdata *EndpointsData) MarshalToMap() map[string]any {
 	return m
 }
 
-type FollowersData struct {
+type ASFollowersData struct {
 	FullIdType
 }
 
-func (attributedtodata *FollowersData) GetSelfOrBase() (BaseApChain, bool) {
+func (attributedtodata *ASFollowersData) GetSelfOrBase() (BaseApChain, bool) {
 	return attributedtodata.FullIdType.Next, true
 }
 
-func (attributedtodata *FollowersData) MarshalToMap() map[string]any {
+func (attributedtodata *ASFollowersData) MarshalToMap() map[string]any {
 	return attributedtodata.FullIdType.MarshalToMapWithName(KEY_ACTIVITYSTREAMS_FOLLOWERS)
 }
 
-type FollowingData struct {
+type ASFollowingData struct {
 	FullIdType
 }
 
-func (attributedtodata *FollowingData) GetSelfOrBase() (BaseApChain, bool) {
+func (attributedtodata *ASFollowingData) GetSelfOrBase() (BaseApChain, bool) {
 	return attributedtodata.FullIdType.Next, true
 }
 
-func (attributedtodata *FollowingData) MarshalToMap() map[string]any {
+func (attributedtodata *ASFollowingData) MarshalToMap() map[string]any {
 	return attributedtodata.FullIdType.MarshalToMapWithName(KEY_ACTIVITYSTREAMS_FOLLOWING)
 }
 
-type HrefData struct {
+type ASHrefData struct {
 	FullIdType
 }
 
-func (attributedtodata *HrefData) GetSelfOrBase() (BaseApChain, bool) {
+func (attributedtodata *ASHrefData) GetSelfOrBase() (BaseApChain, bool) {
 	return attributedtodata.FullIdType.Next, true
 }
 
-func (attributedtodata *HrefData) MarshalToMap() map[string]any {
+func (attributedtodata *ASHrefData) MarshalToMap() map[string]any {
 	return attributedtodata.FullIdType.MarshalToMapWithName(KEY_ACTIVITYSTREAMS_HREF)
 }
 
-type IconData struct {
+type ASIconData struct {
 	Next  BaseApChain
 	Media Media
 }
 
-func (icondata *IconData) GetSelfOrBase() (BaseApChain, bool) {
+func (icondata *ASIconData) GetSelfOrBase() (BaseApChain, bool) {
 	return icondata.Next, true
 }
 
-func (icondata *IconData) MarshalToMap() map[string]any {
+func (icondata *ASIconData) MarshalToMap() map[string]any {
 	return appendWithKey(
 		icondata.Next.MarshalToMap(),
 		KEY_ACTIVITYSTREAMS_ICON,
@@ -183,16 +181,16 @@ func (icondata *IconData) MarshalToMap() map[string]any {
 	)
 }
 
-type ImageData struct {
+type ASImageData struct {
 	Next  BaseApChain
 	Media Media
 }
 
-func (icondata *ImageData) GetSelfOrBase() (BaseApChain, bool) {
+func (icondata *ASImageData) GetSelfOrBase() (BaseApChain, bool) {
 	return icondata.Next, true
 }
 
-func (icondata *ImageData) MarshalToMap() map[string]any {
+func (icondata *ASImageData) MarshalToMap() map[string]any {
 	return appendWithKey(
 		icondata.Next.MarshalToMap(),
 		KEY_ACTIVITYSTREAMS_IMAGE_ATTRIBUTE,
@@ -200,16 +198,16 @@ func (icondata *ImageData) MarshalToMap() map[string]any {
 	)
 }
 
-type MediaTypeData struct {
+type ASMediaTypeData struct {
 	Next BaseApChain
 	Type string
 }
 
-func (mediatypedata *MediaTypeData) GetSelfOrBase() (BaseApChain, bool) {
+func (mediatypedata *ASMediaTypeData) GetSelfOrBase() (BaseApChain, bool) {
 	return mediatypedata.Next, true
 }
 
-func (mediatypedata *MediaTypeData) MarshalToMap() map[string]any {
+func (mediatypedata *ASMediaTypeData) MarshalToMap() map[string]any {
 	return appendWithKey(
 		mediatypedata.Next.MarshalToMap(),
 		KEY_ACTIVITYSTREAMS_MEDIATYPE,
@@ -221,16 +219,16 @@ func (mediatypedata *MediaTypeData) MarshalToMap() map[string]any {
 	)
 }
 
-type NameData struct {
+type ASNameData struct {
 	Next BaseApChain
 	Name ValueValue[string]
 }
 
-func (namedata *NameData) GetSelfOrBase() (BaseApChain, bool) {
+func (namedata *ASNameData) GetSelfOrBase() (BaseApChain, bool) {
 	return namedata.Next, true
 }
 
-func (namedata *NameData) MarshalToMap() map[string]any {
+func (namedata *ASNameData) MarshalToMap() map[string]any {
 	return appendWithKey(
 		namedata.Next.MarshalToMap(),
 		KEY_ACTIVITYSTREAMS_NAME,
@@ -238,40 +236,40 @@ func (namedata *NameData) MarshalToMap() map[string]any {
 	)
 }
 
-type OutboxData struct {
+type ASOutboxData struct {
 	FullIdType
 }
 
-func (attributedtodata *OutboxData) GetSelfOrBase() (BaseApChain, bool) {
+func (attributedtodata *ASOutboxData) GetSelfOrBase() (BaseApChain, bool) {
 	return attributedtodata.FullIdType.Next, true
 }
 
-func (attributedtodata *OutboxData) MarshalToMap() map[string]any {
+func (attributedtodata *ASOutboxData) MarshalToMap() map[string]any {
 	return attributedtodata.FullIdType.MarshalToMapWithName(KEY_ACTIVITYSTREAMS_HREF)
 }
 
-type ObjectData struct {
+type ASObjectData struct {
 	FullIdType
 }
 
-func (object *ObjectData) GetSelfOrBase() (BaseApChain, bool) {
+func (object *ASObjectData) GetSelfOrBase() (BaseApChain, bool) {
 	return object.FullIdType.Next, true
 }
 
-func (object *ObjectData) MarshalToMap() map[string]any {
+func (object *ASObjectData) MarshalToMap() map[string]any {
 	return object.FullIdType.MarshalToMapWithName(KEY_ACTIVITYSTREAMS_OBJECT)
 }
 
-type PreferredNameData struct {
+type ASPreferredNameData struct {
 	Next BaseApChain
 	Name ValueValue[string]
 }
 
-func (namedata *PreferredNameData) GetSelfOrBase() (BaseApChain, bool) {
+func (namedata *ASPreferredNameData) GetSelfOrBase() (BaseApChain, bool) {
 	return namedata.Next, true
 }
 
-func (namedata *PreferredNameData) MarshalToMap() map[string]any {
+func (namedata *ASPreferredNameData) MarshalToMap() map[string]any {
 	return appendWithKey(
 		namedata.Next.MarshalToMap(),
 		KEY_ACTIVITYSTREAMS_PREFFEREDUSERNAME,
@@ -279,31 +277,31 @@ func (namedata *PreferredNameData) MarshalToMap() map[string]any {
 	)
 }
 
-type PublishedData struct {
+type ASPublishedData struct {
 	Next      BaseApChain
 	Timestamp time.Time
 }
 
-func (publisheddata *PublishedData) GetSelfOrBase() (BaseApChain, bool) {
+func (publisheddata *ASPublishedData) GetSelfOrBase() (BaseApChain, bool) {
 	return publisheddata.Next, true
 }
 
-func (publisheddata *PublishedData) MarshalToMap() map[string]any {
+func (publisheddata *ASPublishedData) MarshalToMap() map[string]any {
 	m := publisheddata.Next.MarshalToMap()
 	m[KEY_ACTIVITYSTREAMS_PUBLISHED] = timeToXmlTime(publisheddata.Timestamp)
 	return m
 }
 
-type RestrictedFollowData struct {
+type ASRestrictedFollowData struct {
 	Next  BaseApChain
 	Value ValueValue[bool]
 }
 
-func (namedata *RestrictedFollowData) GetSelfOrBase() (BaseApChain, bool) {
+func (namedata *ASRestrictedFollowData) GetSelfOrBase() (BaseApChain, bool) {
 	return namedata.Next, true
 }
 
-func (namedata *RestrictedFollowData) MarshalToMap() map[string]any {
+func (namedata *ASRestrictedFollowData) MarshalToMap() map[string]any {
 	return appendWithKey(
 		namedata.Next.MarshalToMap(),
 		KEY_ACTIVITYSTREAMS_RESTRICTED_FOLLOW,
@@ -311,40 +309,40 @@ func (namedata *RestrictedFollowData) MarshalToMap() map[string]any {
 	)
 }
 
-type RepliesData struct {
+type ASRepliesData struct {
 	FullIdType
 }
 
-func (object *RepliesData) GetSelfOrBase() (BaseApChain, bool) {
+func (object *ASRepliesData) GetSelfOrBase() (BaseApChain, bool) {
 	return object.FullIdType.Next, true
 }
 
-func (object *RepliesData) MarshalToMap() map[string]any {
+func (object *ASRepliesData) MarshalToMap() map[string]any {
 	return object.FullIdType.MarshalToMapWithName(KEY_ACTIVITYSTREAMS_REPLIES)
 }
 
-type SharedInboxData struct {
+type ASSharedInboxData struct {
 	FullIdType
 }
 
-func (object *SharedInboxData) GetSelfOrBase() (BaseApChain, bool) {
+func (object *ASSharedInboxData) GetSelfOrBase() (BaseApChain, bool) {
 	return object.FullIdType.Next, true
 }
 
-func (object *SharedInboxData) MarshalToMap() map[string]any {
+func (object *ASSharedInboxData) MarshalToMap() map[string]any {
 	return object.FullIdType.MarshalToMapWithName(KEY_ACTIVITYSTREAMS_SHAREDINBOX)
 }
 
-type SummaryData struct {
+type ASSummaryData struct {
 	Next BaseApChain
 	Name ValueValue[string]
 }
 
-func (namedata *SummaryData) GetSelfOrBase() (BaseApChain, bool) {
+func (namedata *ASSummaryData) GetSelfOrBase() (BaseApChain, bool) {
 	return namedata.Next, true
 }
 
-func (namedata *SummaryData) MarshalToMap() map[string]any {
+func (namedata *ASSummaryData) MarshalToMap() map[string]any {
 	return appendWithKey(
 		namedata.Next.MarshalToMap(),
 		KEY_ACTIVITYSTREAMS_SUMMARY,
@@ -352,16 +350,16 @@ func (namedata *SummaryData) MarshalToMap() map[string]any {
 	)
 }
 
-type SensitiveData struct {
+type ASSensitiveData struct {
 	Next BaseApChain
 	Name ValueValue[bool]
 }
 
-func (namedata *SensitiveData) GetSelfOrBase() (BaseApChain, bool) {
+func (namedata *ASSensitiveData) GetSelfOrBase() (BaseApChain, bool) {
 	return namedata.Next, true
 }
 
-func (namedata *SensitiveData) MarshalToMap() map[string]any {
+func (namedata *ASSensitiveData) MarshalToMap() map[string]any {
 	return appendWithKey(
 		namedata.Next.MarshalToMap(),
 		KEY_ACTIVITYSTREAMS_SENSITIVE,
@@ -369,16 +367,16 @@ func (namedata *SensitiveData) MarshalToMap() map[string]any {
 	)
 }
 
-type TagData struct {
+type ASTagData struct {
 	Next BaseApChain
 	Tags []string
 }
 
-func (tagdata *TagData) GetSelfOrBase() (BaseApChain, bool) {
+func (tagdata *ASTagData) GetSelfOrBase() (BaseApChain, bool) {
 	return tagdata.Next, true
 }
 
-func (tagdata *TagData) MarshalToMap() map[string]any {
+func (tagdata *ASTagData) MarshalToMap() map[string]any {
 	return appendWithKey(
 		tagdata.Next.MarshalToMap(),
 		KEY_ACTIVITYSTREAMS_TAG,
@@ -388,16 +386,16 @@ func (tagdata *TagData) MarshalToMap() map[string]any {
 	)
 }
 
-type ToData struct {
+type ASToData struct {
 	Next    BaseApChain
 	Targets []string
 }
 
-func (cc *ToData) GetSelfOrBase() (BaseApChain, bool) {
+func (cc *ASToData) GetSelfOrBase() (BaseApChain, bool) {
 	return cc.Next, true
 }
 
-func (cc *ToData) MarshalToMap() map[string]any {
+func (cc *ASToData) MarshalToMap() map[string]any {
 	return appendWithKey(
 		cc.Next.MarshalToMap(),
 		KEY_ACTIVITYSTREAMS_TO,
@@ -407,30 +405,28 @@ func (cc *ToData) MarshalToMap() map[string]any {
 	)
 }
 
-// Url
-type UrlData struct {
+type ASUrlData struct {
 	FullIdType
 }
 
-func (object *UrlData) GetSelfOrBase() (BaseApChain, bool) {
+func (object *ASUrlData) GetSelfOrBase() (BaseApChain, bool) {
 	return object.FullIdType.Next, true
 }
 
-func (object *UrlData) MarshalToMap() map[string]any {
+func (object *ASUrlData) MarshalToMap() map[string]any {
 	return object.FullIdType.MarshalToMapWithName(KEY_ACTIVITYSTREAMS_SHAREDINBOX)
 }
 
-// Updated
-type UpdatedData struct {
+type ASUpdatedData struct {
 	Next      BaseApChain
 	Timestamp time.Time
 }
 
-func (publisheddata *UpdatedData) GetSelfOrBase() (BaseApChain, bool) {
+func (publisheddata *ASUpdatedData) GetSelfOrBase() (BaseApChain, bool) {
 	return publisheddata.Next, true
 }
 
-func (publisheddata *UpdatedData) MarshalToMap() map[string]any {
+func (publisheddata *ASUpdatedData) MarshalToMap() map[string]any {
 	m := publisheddata.Next.MarshalToMap()
 	m[KEY_ACTIVITYSTREAMS_PUBLISHED] = timeToXmlTime(publisheddata.Timestamp)
 	return m
diff --git a/nsLitepub.go b/nsLitepub.go
index da7f485..3526e6c 100644
--- a/nsLitepub.go
+++ b/nsLitepub.go
@@ -1,15 +1,15 @@
 package goap
 
-type CapabilitiesData struct {
+type LitepubCapabilitiesData struct {
 	Next         BaseApChain
 	Capabilities []map[string]any
 }
 
-func (capabilitiesdata *CapabilitiesData) GetSelfOrBase() (BaseApChain, bool) {
+func (capabilitiesdata *LitepubCapabilitiesData) GetSelfOrBase() (BaseApChain, bool) {
 	return capabilitiesdata.Next, true
 }
 
-func (capabilitiesdata *CapabilitiesData) MarshalToMap() map[string]any {
+func (capabilitiesdata *LitepubCapabilitiesData) MarshalToMap() map[string]any {
 	return appendWithKey(
 		capabilitiesdata.Next.MarshalToMap(),
 		KEY_LITEPUB_CAPABILITIES,
@@ -17,15 +17,15 @@ func (capabilitiesdata *CapabilitiesData) MarshalToMap() map[string]any {
 	)
 }
 
-type OauthRegistrationEndpointData struct {
+type LitepubOauthRegistrationEndpointData struct {
 	FullIdType
 }
 
-func (oauthregistrationendpointdata *OauthRegistrationEndpointData) GetSelfOrBase() (BaseApChain, bool) {
+func (oauthregistrationendpointdata *LitepubOauthRegistrationEndpointData) GetSelfOrBase() (BaseApChain, bool) {
 	return oauthregistrationendpointdata.FullIdType.GetSelfOrBase()
 }
 
-func (oauthregistrationendpointdata *OauthRegistrationEndpointData) MarshalToMap() map[string]any {
+func (oauthregistrationendpointdata *LitepubOauthRegistrationEndpointData) MarshalToMap() map[string]any {
 	return oauthregistrationendpointdata.FullIdType.MarshalToMapWithName(
 		KEY_ACTIVITYSTREAMS_OAUTHAUTHORIZATION,
 	)
diff --git a/nsMasto.go b/nsMasto.go
index fa5abd3..7a85a44 100644
--- a/nsMasto.go
+++ b/nsMasto.go
@@ -1,27 +1,27 @@
 package goap
 
-type DevicesData struct {
+type MastoDevicesData struct {
 	FullIdType
 }
 
-func (actor *DevicesData) GetSelfOrBase() (BaseApChain, bool) {
+func (actor *MastoDevicesData) GetSelfOrBase() (BaseApChain, bool) {
 	return actor.FullIdType.GetSelfOrBase()
 }
 
-func (actor *DevicesData) MarshalToMap() map[string]any {
+func (actor *MastoDevicesData) MarshalToMap() map[string]any {
 	return actor.FullIdType.MarshalToMapWithName(KEY_MASTO_DEVICES)
 }
 
-type DiscoverableData struct {
+type MastoDiscoverableData struct {
 	Next  BaseApChain
 	Value ValueValue[bool]
 }
 
-func (namedata *DiscoverableData) GetSelfOrBase() (BaseApChain, bool) {
+func (namedata *MastoDiscoverableData) GetSelfOrBase() (BaseApChain, bool) {
 	return namedata.Next, true
 }
 
-func (namedata *DiscoverableData) MarshalToMap() map[string]any {
+func (namedata *MastoDiscoverableData) MarshalToMap() map[string]any {
 	return appendWithKey(
 		namedata.Next.MarshalToMap(),
 		KEY_MASTO_DISCOVERABLE,
@@ -29,40 +29,40 @@ func (namedata *DiscoverableData) MarshalToMap() map[string]any {
 	)
 }
 
-type FeaturedData struct {
+type MastoFeaturedData struct {
 	FullIdType
 }
 
-func (actor *FeaturedData) GetSelfOrBase() (BaseApChain, bool) {
+func (actor *MastoFeaturedData) GetSelfOrBase() (BaseApChain, bool) {
 	return actor.FullIdType.GetSelfOrBase()
 }
 
-func (actor *FeaturedData) MarshalToMap() map[string]any {
+func (actor *MastoFeaturedData) MarshalToMap() map[string]any {
 	return actor.FullIdType.MarshalToMapWithName(KEY_MASTO_FEATURED)
 }
 
-type FeaturedTagsData struct {
+type MastoFeaturedTagsData struct {
 	FullIdType
 }
 
-func (actor *FeaturedTagsData) GetSelfOrBase() (BaseApChain, bool) {
+func (actor *MastoFeaturedTagsData) GetSelfOrBase() (BaseApChain, bool) {
 	return actor.FullIdType.GetSelfOrBase()
 }
 
-func (actor *FeaturedTagsData) MarshalToMap() map[string]any {
+func (actor *MastoFeaturedTagsData) MarshalToMap() map[string]any {
 	return actor.FullIdType.MarshalToMapWithName(KEY_MASTO_FEATURED_TAGS)
 }
 
-type IndexableData struct {
+type MastoIndexableData struct {
 	Next  BaseApChain
 	Value ValueValue[bool]
 }
 
-func (namedata *IndexableData) GetSelfOrBase() (BaseApChain, bool) {
+func (namedata *MastoIndexableData) GetSelfOrBase() (BaseApChain, bool) {
 	return namedata.Next, true
 }
 
-func (namedata *IndexableData) MarshalToMap() map[string]any {
+func (namedata *MastoIndexableData) MarshalToMap() map[string]any {
 	return appendWithKey(
 		namedata.Next.MarshalToMap(),
 		KEY_MASTO_INDEXABLE,
@@ -70,16 +70,16 @@ func (namedata *IndexableData) MarshalToMap() map[string]any {
 	)
 }
 
-type MemorialData struct {
+type MastoMemorialData struct {
 	Next  BaseApChain
 	Value ValueValue[bool]
 }
 
-func (namedata *MemorialData) GetSelfOrBase() (BaseApChain, bool) {
+func (namedata *MastoMemorialData) GetSelfOrBase() (BaseApChain, bool) {
 	return namedata.Next, true
 }
 
-func (namedata *MemorialData) MarshalToMap() map[string]any {
+func (namedata *MastoMemorialData) MarshalToMap() map[string]any {
 	return appendWithKey(
 		namedata.Next.MarshalToMap(),
 		KEY_MASTO_MEMORIAL,
diff --git a/nsMisskey.go b/nsMisskey.go
index b31c936..a01f290 100644
--- a/nsMisskey.go
+++ b/nsMisskey.go
@@ -1,15 +1,17 @@
 package goap
 
-type MisskeySummaryData struct {
+// NOTE: Different to ASSummaryData
+// Misskey summary is the raw text without formatting applied while the Activitystreams summary already contains the preformatted summary
+type MKSummaryData struct {
 	Next    BaseApChain
 	Summary string
 }
 
-func (misskeysummarydata *MisskeySummaryData) GetSelfOrBase() (BaseApChain, bool) {
+func (misskeysummarydata *MKSummaryData) GetSelfOrBase() (BaseApChain, bool) {
 	return misskeysummarydata.Next, true
 }
 
-func (misskeysummarydata *MisskeySummaryData) MarshalToMap() map[string]any {
+func (misskeysummarydata *MKSummaryData) MarshalToMap() map[string]any {
 	return appendWithKey(
 		misskeysummarydata.Next.MarshalToMap(),
 		KEY_MISSKEY_MKSUMMARY,
@@ -17,16 +19,16 @@ func (misskeysummarydata *MisskeySummaryData) MarshalToMap() map[string]any {
 	)
 }
 
-type IsCatData struct {
+type MKIsCatData struct {
 	Next  BaseApChain
 	IsCat bool
 }
 
-func (iscatdata *IsCatData) GetSelfOrBase() (BaseApChain, bool) {
+func (iscatdata *MKIsCatData) GetSelfOrBase() (BaseApChain, bool) {
 	return iscatdata.Next, true
 }
 
-func (iscatdata *IsCatData) MarshalToMap() map[string]any {
+func (iscatdata *MKIsCatData) MarshalToMap() map[string]any {
 	return appendWithKey(
 		iscatdata.Next.MarshalToMap(),
 		KEY_MISSKEY_ISCAT,
@@ -34,16 +36,16 @@ func (iscatdata *IsCatData) MarshalToMap() map[string]any {
 	)
 }
 
-type SpeakAsCatData struct {
+type MKSpeakAsCatData struct {
 	Next        BaseApChain
 	SpeaksAsCat bool
 }
 
-func (iscatdata *SpeakAsCatData) GetSelfOrBase() (BaseApChain, bool) {
+func (iscatdata *MKSpeakAsCatData) GetSelfOrBase() (BaseApChain, bool) {
 	return iscatdata.Next, true
 }
 
-func (iscatdata *SpeakAsCatData) MarshalToMap() map[string]any {
+func (iscatdata *MKSpeakAsCatData) MarshalToMap() map[string]any {
 	return appendWithKey(
 		iscatdata.Next.MarshalToMap(),
 		KEY_FIREFISH_SPEAKASCAT,
diff --git a/nsOstatus.go b/nsOstatus.go
index 642c77c..c3942d2 100644
--- a/nsOstatus.go
+++ b/nsOstatus.go
@@ -1,15 +1,15 @@
 package goap
 
-type AtomUriData struct {
+type OstatusAtomUriData struct {
 	Next BaseApChain
 	Uri  string
 }
 
-func (atomurivalue *AtomUriData) GetSelfOrBase() (BaseApChain, bool) {
+func (atomurivalue *OstatusAtomUriData) GetSelfOrBase() (BaseApChain, bool) {
 	return atomurivalue.Next, true
 }
 
-func (atomurivalue *AtomUriData) MarshalToMap() map[string]any {
+func (atomurivalue *OstatusAtomUriData) MarshalToMap() map[string]any {
 	return appendWithKey(
 		atomurivalue.Next.MarshalToMap(),
 		KEY_OSTATUS_ATOMURI,
@@ -17,16 +17,16 @@ func (atomurivalue *AtomUriData) MarshalToMap() map[string]any {
 	)
 }
 
-type ConversationData struct {
+type OstatusConversationData struct {
 	Next BaseApChain
 	Uri  string
 }
 
-func (atomurivalue *ConversationData) GetSelfOrBase() (BaseApChain, bool) {
+func (atomurivalue *OstatusConversationData) GetSelfOrBase() (BaseApChain, bool) {
 	return atomurivalue.Next, true
 }
 
-func (atomurivalue *ConversationData) MarshalToMap() map[string]any {
+func (atomurivalue *OstatusConversationData) MarshalToMap() map[string]any {
 	return appendWithKey(
 		atomurivalue.Next.MarshalToMap(),
 		KEY_OSTATUS_CONVERSATION,
diff --git a/nsSchema.go b/nsSchema.go
index b284205..7d9f385 100644
--- a/nsSchema.go
+++ b/nsSchema.go
@@ -1,15 +1,15 @@
 package goap
 
-type ValueData struct {
+type SchemaValueData struct {
 	Next  BaseApChain
 	Value ValueValue[string]
 }
 
-func (namedata *ValueData) GetSelfOrBase() (BaseApChain, bool) {
+func (namedata *SchemaValueData) GetSelfOrBase() (BaseApChain, bool) {
 	return namedata.Next, true
 }
 
-func (namedata *ValueData) MarshalToMap() map[string]any {
+func (namedata *SchemaValueData) MarshalToMap() map[string]any {
 	return appendWithKey(
 		namedata.Next.MarshalToMap(),
 		KEY_SCHEMA_VALUE,
diff --git a/nsW3.go b/nsW3.go
index 191a2a0..b4b3b6f 100644
--- a/nsW3.go
+++ b/nsW3.go
@@ -1,14 +1,13 @@
 package goap
 
-// inbox
-type InboxData struct {
+type W3InboxData struct {
 	FullIdType
 }
 
-func (actor *InboxData) GetSelfOrBase() (BaseApChain, bool) {
+func (actor *W3InboxData) GetSelfOrBase() (BaseApChain, bool) {
 	return actor.FullIdType.GetSelfOrBase()
 }
 
-func (actor *InboxData) MarshalToMap() map[string]any {
+func (actor *W3InboxData) MarshalToMap() map[string]any {
 	return actor.FullIdType.MarshalToMapWithName(KEY_W3_INBOX)
 }
diff --git a/nsW3Security.go b/nsW3Security.go
index 42ade7f..d0431f4 100644
--- a/nsW3Security.go
+++ b/nsW3Security.go
@@ -1,30 +1,29 @@
 package goap
 
-// Owner
-type OwnerData struct {
+type W3SecurityOwnerData struct {
 	FullIdType
 }
 
-func (actor *OwnerData) GetSelfOrBase() (BaseApChain, bool) {
+func (actor *W3SecurityOwnerData) GetSelfOrBase() (BaseApChain, bool) {
 	return actor.FullIdType.GetSelfOrBase()
 }
 
-func (actor *OwnerData) MarshalToMap() map[string]any {
+func (actor *W3SecurityOwnerData) MarshalToMap() map[string]any {
 	return actor.FullIdType.MarshalToMapWithName(KEY_W3_SECURITY_OWNER)
 }
 
-type PublicKeyData struct {
+type W3SecurityPublicKeyData struct {
 	Next  BaseApChain
 	Id    string
 	Owner string
 	Key   string
 }
 
-func (publickeydata *PublicKeyData) GetSelfOrBase() (BaseApChain, bool) {
+func (publickeydata *W3SecurityPublicKeyData) GetSelfOrBase() (BaseApChain, bool) {
 	return publickeydata.Next, true
 }
 
-func (publickeydata *PublicKeyData) MarshalToMap() map[string]any {
+func (publickeydata *W3SecurityPublicKeyData) MarshalToMap() map[string]any {
 	m := publickeydata.Next.MarshalToMap()
 	m[KEY_W3_SECURITY_PUBLICKEY] = []map[string]any{{
 		KEY_ID:                       publickeydata.Id,
@@ -34,16 +33,16 @@ func (publickeydata *PublicKeyData) MarshalToMap() map[string]any {
 	return m
 }
 
-type PublicKeyPemData struct {
+type W3SecurityPublicKeyPemData struct {
 	Next  BaseApChain
 	Value ValueValue[bool]
 }
 
-func (namedata *PublicKeyPemData) GetSelfOrBase() (BaseApChain, bool) {
+func (namedata *W3SecurityPublicKeyPemData) GetSelfOrBase() (BaseApChain, bool) {
 	return namedata.Next, true
 }
 
-func (namedata *PublicKeyPemData) MarshalToMap() map[string]any {
+func (namedata *W3SecurityPublicKeyPemData) MarshalToMap() map[string]any {
 	return appendWithKey(
 		namedata.Next.MarshalToMap(),
 		KEY_W3_SECURITY_PUBLICKEYPEM,
diff --git a/nsW3Vcard.go b/nsW3Vcard.go
index 69b355d..c505a6b 100644
--- a/nsW3Vcard.go
+++ b/nsW3Vcard.go
@@ -1,15 +1,15 @@
 package goap
 
-type AddressData struct {
+type W3VcardAddressData struct {
 	Next    BaseApChain
 	Address string
 }
 
-func (misskeysummarydata *AddressData) GetSelfOrBase() (BaseApChain, bool) {
+func (misskeysummarydata *W3VcardAddressData) GetSelfOrBase() (BaseApChain, bool) {
 	return misskeysummarydata.Next, true
 }
 
-func (misskeysummarydata *AddressData) MarshalToMap() map[string]any {
+func (misskeysummarydata *W3VcardAddressData) MarshalToMap() map[string]any {
 	return appendWithKey(
 		misskeysummarydata.Next.MarshalToMap(),
 		KEY_W3_VCARD_ADRESS,
@@ -17,16 +17,16 @@ func (misskeysummarydata *AddressData) MarshalToMap() map[string]any {
 	)
 }
 
-type BirthdayData struct {
+type W3VcardBirthdayData struct {
 	Next     BaseApChain
 	Birthday string
 }
 
-func (misskeysummarydata *BirthdayData) GetSelfOrBase() (BaseApChain, bool) {
+func (misskeysummarydata *W3VcardBirthdayData) GetSelfOrBase() (BaseApChain, bool) {
 	return misskeysummarydata.Next, true
 }
 
-func (misskeysummarydata *BirthdayData) MarshalToMap() map[string]any {
+func (misskeysummarydata *W3VcardBirthdayData) MarshalToMap() map[string]any {
 	return appendWithKey(
 		misskeysummarydata.Next.MarshalToMap(),
 		KEY_W3_VCARD_BIRTHDAY,