diff --git a/tests/acceptance/features/apiActivities/activities.feature b/tests/acceptance/features/apiActivities/activities.feature
index dfe99ac7e..9944535bd 100644
--- a/tests/acceptance/features/apiActivities/activities.feature
+++ b/tests/acceptance/features/apiActivities/activities.feature
@@ -35,7 +35,7 @@ Feature: check activities
                   "required": ["message","variables"],
                   "properties": {
                     "message": {
-                      "const": "{user} added {resource} to {space}"
+                      "const": "{user} added {resource} to {folder}"
                     },
                     "variables": {
                       "type": "object",
@@ -125,7 +125,7 @@ Feature: check activities
                   "required": ["message","variables"],
                   "properties": {
                     "message": {
-                      "const": "{user} added {resource} to {space}"
+                      "const": "{user} added {resource} to {folder}"
                     },
                     "variables": {
                       "type": "object",
@@ -221,7 +221,7 @@ Feature: check activities
                       "required": ["message","variables"],
                       "properties": {
                         "message": {
-                          "const": "{user} added {resource} to {space}"
+                          "const": "{user} added {resource} to {folder}"
                         },
                         "variables": {
                           "type": "object",
@@ -251,7 +251,7 @@ Feature: check activities
                       "required": ["message","variables"],
                       "properties": {
                         "message": {
-                          "const": "{user} added {resource} to {space}"
+                          "const": "{user} added {resource} to {folder}"
                         },
                         "variables": {
                           "type": "object",
@@ -285,7 +285,7 @@ Feature: check activities
                       "required": ["message","variables"],
                       "properties": {
                         "message": {
-                          "const": "{user} deleted {resource} from {space}"
+                          "const": "{user} deleted {resource} from {folder}"
                         },
                         "variables": {
                           "type": "object",
@@ -359,7 +359,7 @@ Feature: check activities
                       "required": ["message","variables"],
                       "properties": {
                         "message": {
-                          "const": "{user} deleted {resource} from {space}"
+                          "const": "{user} deleted {resource} from {folder}"
                         },
                         "variables": {
                           "type": "object",
@@ -458,7 +458,7 @@ Feature: check activities
                       "required": ["message","variables"],
                       "properties": {
                         "message": {
-                          "const": "{user} added {resource} to {space}"
+                          "const": "{user} added {resource} to {folder}"
                         }
                       }
                     }
@@ -477,7 +477,7 @@ Feature: check activities
                       "required": ["message","variables"],
                       "properties": {
                         "message": {
-                          "const": "{user} moved {resource} to {space}"
+                          "const": "{user} moved {resource} to {folder}"
                         },
                         "variables": {
                           "type": "object",
@@ -568,7 +568,7 @@ Feature: check activities
                       "required": ["message","variables"],
                       "properties": {
                         "message": {
-                          "const": "{user} added {resource} to {space}"
+                          "const": "{user} added {resource} to {folder}"
                         }
                       }
                     }
@@ -587,7 +587,7 @@ Feature: check activities
                       "required": ["message","variables"],
                       "properties": {
                         "message": {
-                          "const": "{user} moved {resource} to {space}"
+                          "const": "{user} moved {resource} to {folder}"
                         },
                         "variables": {
                           "type": "object",
@@ -685,7 +685,7 @@ Feature: check activities
                       "required": ["message", "variables"],
                       "properties": {
                         "message": {
-                          "const": "{user} added {resource} to {space}"
+                          "const": "{user} added {resource} to {folder}"
                         }
                       }
                     }
@@ -794,7 +794,7 @@ Feature: check activities
                       "required": ["message", "variables"],
                       "properties": {
                         "message": {
-                          "const": "{user} added {resource} to {space}"
+                          "const": "{user} added {resource} to {folder}"
                         }
                       }
                     }
@@ -916,7 +916,7 @@ Feature: check activities
                       "required": ["message", "variables"],
                       "properties": {
                         "message": {
-                          "const": "{user} added {resource} to {space}"
+                          "const": "{user} added {resource} to {folder}"
                         },
                         "variables": {
                           "type": "object",
@@ -946,7 +946,7 @@ Feature: check activities
                       "required": ["message", "variables"],
                       "properties": {
                         "message": {
-                          "const": "{user} added {resource} to {space}"
+                          "const": "{user} added {resource} to {folder}"
                         },
                         "variables": {
                           "type": "object",
@@ -976,7 +976,7 @@ Feature: check activities
                       "required": ["message", "variables"],
                       "properties": {
                         "message": {
-                          "const": "{user} added {resource} to {space}"
+                          "const": "{user} added {resource} to {folder}"
                         },
                         "variables": {
                           "type": "object",
@@ -1006,7 +1006,7 @@ Feature: check activities
                       "required": ["message", "variables"],
                       "properties": {
                         "message": {
-                          "const": "{user} added {resource} to {space}"
+                          "const": "{user} added {resource} to {folder}"
                         },
                         "variables": {
                           "type": "object",
@@ -1036,7 +1036,7 @@ Feature: check activities
                       "required": ["message", "variables"],
                       "properties": {
                         "message": {
-                          "const": "{user} moved {resource} to {space}"
+                          "const": "{user} moved {resource} to {folder}"
                         },
                         "variables": {
                           "type": "object",
@@ -1066,7 +1066,7 @@ Feature: check activities
                       "required": ["message", "variables"],
                       "properties": {
                         "message": {
-                          "const": "{user} moved {resource} to {space}"
+                          "const": "{user} moved {resource} to {folder}"
                         },
                         "variables": {
                           "type": "object",
@@ -1174,7 +1174,7 @@ Feature: check activities
                       "required": ["message", "variables"],
                       "properties": {
                         "message": {
-                          "const": "{user} deleted {resource} from {space}"
+                          "const": "{user} deleted {resource} from {folder}"
                         },
                         "variables": {
                           "type": "object",
@@ -1204,7 +1204,7 @@ Feature: check activities
                       "required": ["message", "variables"],
                       "properties": {
                         "message": {
-                          "const": "{user} deleted {resource} from {space}"
+                          "const": "{user} deleted {resource} from {folder}"
                         },
                         "variables": {
                           "type": "object",
@@ -1261,7 +1261,7 @@ Feature: check activities
                   "required": ["message","variables"],
                   "properties": {
                     "message": {
-                      "const": "{user} hat {resource} zu {space} hinzugefügt"
+                      "const": "{user} hat {resource} zu {folder} hinzugefügt"
                     },
                     "variables": {
                       "type": "object",
@@ -1485,7 +1485,7 @@ Feature: check activities
                       "required": ["message", "variables"],
                       "properties": {
                         "message": {
-                          "const": "{user} added {resource} to {space}"
+                          "const": "{user} added {resource} to {folder}"
                         },
                         "variables": {
                           "type": "object",
@@ -1519,7 +1519,7 @@ Feature: check activities
                       "required": ["message", "variables"],
                       "properties": {
                         "message": {
-                          "const": "{user} added {resource} to {space}"
+                          "const": "{user} added {resource} to {folder}"
                         },
                         "variables": {
                           "type": "object",
@@ -1580,7 +1580,7 @@ Feature: check activities
                       "required": ["message", "variables"],
                       "properties": {
                         "message": {
-                          "const": "{user} added {resource} to {space}"
+                          "const": "{user} added {resource} to {folder}"
                         },
                         "variables": {
                           "type": "object",
@@ -1614,7 +1614,7 @@ Feature: check activities
                       "required": ["message", "variables"],
                       "properties": {
                         "message": {
-                          "const": "{user} added {resource} to {space}"
+                          "const": "{user} added {resource} to {folder}"
                         },
                         "variables": {
                           "type": "object",
diff --git a/tests/acceptance/features/apiActivities/shareActivities.feature b/tests/acceptance/features/apiActivities/shareActivities.feature
index 7d039e5b3..6ba23e760 100644
--- a/tests/acceptance/features/apiActivities/shareActivities.feature
+++ b/tests/acceptance/features/apiActivities/shareActivities.feature
@@ -42,7 +42,7 @@ Feature: check share activity
                       "required": ["message","variables"],
                       "properties": {
                         "message": {
-                          "const": "{user} added {resource} to {space}"
+                          "const": "{user} added {resource} to {folder}"
                         }
                       }
                     }
@@ -162,7 +162,7 @@ Feature: check share activity
                       "required": ["message","variables"],
                       "properties": {
                         "message": {
-                          "const": "{user} added {resource} to {space}"
+                          "const": "{user} added {resource} to {folder}"
                         }
                       }
                     }
@@ -299,7 +299,7 @@ Feature: check share activity
                       "required": ["message","variables"],
                       "properties": {
                         "message": {
-                          "const": "{user} added {resource} to {space}"
+                          "const": "{user} added {resource} to {folder}"
                         }
                       }
                     }
@@ -405,7 +405,7 @@ Feature: check share activity
                       "required": ["message","variables"],
                       "properties": {
                         "message": {
-                          "const": "{user} added {resource} to {space}"
+                          "const": "{user} added {resource} to {folder}"
                         }
                       }
                     }
@@ -539,48 +539,7 @@ Feature: check share activity
                       "required": ["message","variables"],
                       "properties": {
                         "message": {
-                          "const": "{user} added {resource} to {space}"
-                        },
-                        "variables": {
-                          "type": "object",
-                          "required": ["resource","space","user"],
-                          "properties": {
-                            "resource": {
-                              "type": "object",
-                              "required": ["id","name"],
-                              "properties": {
-                                "name": {
-                                  "const": "FOLDER"
-                                }
-                              }
-                            },
-                            "space": {
-                              "type": "object",
-                              "required": ["id","name"],
-                              "properties": {
-                                "id": {
-                                  "type": "string",
-                                  "pattern": "^%user_id_pattern%!%user_id_pattern%$"
-                                },
-                                "name": {
-                                  "const": "Alice Hansen"
-                                }
-                              }
-                            },
-                            "user": {
-                              "type": "object",
-                              "required": ["id","displayName"],
-                              "properties": {
-                                "id": {
-                                  "type": "string",
-                                  "pattern": "%user_id_pattern%"
-                                },
-                                "displayName": {
-                                  "const": "Alice"
-                                }
-                              }
-                            }
-                          }
+                          "const": "{user} added {resource} to {folder}"
                         }
                       }
                     }
@@ -618,7 +577,7 @@ Feature: check share activity
                       "required": ["message","variables"],
                       "properties": {
                         "message": {
-                          "const": "{user} added {resource} to {space}"
+                          "const": "{user} added {resource} to {folder}"
                         },
                         "variables": {
                           "type": "object",
@@ -639,7 +598,7 @@ Feature: check share activity
                               "properties": {
                                 "id": {
                                   "type": "string",
-                                  "pattern": "^%file_id_pattern%$"
+                                  "pattern": "^%user_id_pattern%!%user_id_pattern%$"
                                 },
                                 "name": {
                                   "const": "Alice Hansen"
@@ -678,7 +637,7 @@ Feature: check share activity
                       "required": ["message","variables"],
                       "properties": {
                         "message": {
-                          "const": "{user} updated {resource} in {folder}"
+                          "const": "{user} added {resource} to {folder}"
                         },
                         "variables": {
                           "type": "object",
@@ -699,7 +658,7 @@ Feature: check share activity
                               "properties": {
                                 "id": {
                                   "type": "string",
-                                  "pattern": "^%file_id_pattern%$"
+                                  "pattern": "^%user_id_pattern%!%user_id_pattern%$"
                                 },
                                 "name": {
                                   "const": "Alice Hansen"
@@ -738,7 +697,7 @@ Feature: check share activity
                       "required": ["message","variables"],
                       "properties": {
                         "message": {
-                          "const": "{user} deleted {resource} from {space}"
+                          "const": "{user} deleted {resource} from {folder}"
                         },
                         "variables": {
                           "type": "object",