diff --git a/app/views/accounts/show.rabl b/app/views/accounts/show.activitystreams2.rabl
similarity index 81%
rename from app/views/accounts/show.rabl
rename to app/views/accounts/show.activitystreams2.rabl
index def91b425..dabae3f29 100644
--- a/app/views/accounts/show.rabl
+++ b/app/views/accounts/show.activitystreams2.rabl
@@ -1,4 +1,4 @@
-extends 'activitypub/types/person.rabl'
+extends 'activitypub/types/person.activitystreams2.rabl'
 
 object @account
 
diff --git a/app/views/activitypub/base.rabl b/app/views/activitypub/base.activitystreams2.rabl
similarity index 100%
rename from app/views/activitypub/base.rabl
rename to app/views/activitypub/base.activitystreams2.rabl
diff --git a/app/views/activitypub/intransient.activitystreams2.rabl b/app/views/activitypub/intransient.activitystreams2.rabl
new file mode 100644
index 000000000..968e451c2
--- /dev/null
+++ b/app/views/activitypub/intransient.activitystreams2.rabl
@@ -0,0 +1,3 @@
+extends 'activitypub/base.activitystreams2.rabl'
+
+node(:id) { request.original_url }
diff --git a/app/views/activitypub/intransient.rabl b/app/views/activitypub/intransient.rabl
deleted file mode 100644
index 21261f56d..000000000
--- a/app/views/activitypub/intransient.rabl
+++ /dev/null
@@ -1,3 +0,0 @@
-extends 'activitypub/base.rabl'
-
-node(:id) { request.original_url }
diff --git a/app/views/activitypub/types/person.activitystreams2.rabl b/app/views/activitypub/types/person.activitystreams2.rabl
new file mode 100644
index 000000000..487a60791
--- /dev/null
+++ b/app/views/activitypub/types/person.activitystreams2.rabl
@@ -0,0 +1,3 @@
+extends 'activitypub/intransient.activitystreams2.rabl'
+
+node(:type) { 'Person' }
diff --git a/app/views/activitypub/types/person.rabl b/app/views/activitypub/types/person.rabl
deleted file mode 100644
index c284fc53b..000000000
--- a/app/views/activitypub/types/person.rabl
+++ /dev/null
@@ -1,3 +0,0 @@
-extends 'activitypub/intransient.rabl'
-
-node(:type) { 'Person' }