diff --git a/extensions/audit/pkg/service/service_test.go b/extensions/audit/pkg/service/service_test.go
index 6fb5dc1ea0..6d45dfde1a 100644
--- a/extensions/audit/pkg/service/service_test.go
+++ b/extensions/audit/pkg/service/service_test.go
@@ -297,8 +297,8 @@ var testCases = []struct {
 	}, {
 		Alias: "File created",
 		SystemEvent: events.FileUploaded{
-			FileID: reference("sto-123", "iid-123", "./item"),
-			Owner:  userID("uid-123"), // NOTE: owner not yet implemented in reva
+			Ref:   reference("sto-123", "iid-123", "./item"),
+			Owner: userID("uid-123"), // NOTE: owner not yet implemented in reva
 		},
 		CheckAuditEvent: func(t *testing.T, b []byte) {
 			ev := types.AuditEventFileCreated{}
@@ -312,8 +312,8 @@ var testCases = []struct {
 	}, {
 		Alias: "File read",
 		SystemEvent: events.FileDownloaded{
-			FileID: reference("sto-123", "iid-123", "./item"),
-			Owner:  userID("uid-123"), // NOTE: owner not yet implemented in reva
+			Ref:   reference("sto-123", "iid-123", "./item"),
+			Owner: userID("uid-123"), // NOTE: owner not yet implemented in reva
 		},
 		CheckAuditEvent: func(t *testing.T, b []byte) {
 			ev := types.AuditEventFileRead{}
@@ -327,8 +327,8 @@ var testCases = []struct {
 	}, {
 		Alias: "File trashed",
 		SystemEvent: events.ItemTrashed{
-			FileID: reference("sto-123", "iid-123", "./item"),
-			Owner:  userID("uid-123"), // NOTE: owner not yet implemented in reva
+			Ref:   reference("sto-123", "iid-123", "./item"),
+			Owner: userID("uid-123"), // NOTE: owner not yet implemented in reva
 		},
 		CheckAuditEvent: func(t *testing.T, b []byte) {
 			ev := types.AuditEventFileDeleted{}
@@ -342,7 +342,7 @@ var testCases = []struct {
 	}, {
 		Alias: "File renamed",
 		SystemEvent: events.ItemMoved{
-			FileID:       reference("sto-123", "iid-123", "./item"),
+			Ref:          reference("sto-123", "iid-123", "./item"),
 			OldReference: reference("sto-123", "iid-123", "./anotheritem"),
 			Owner:        userID("uid-123"), // NOTE: owner not yet implemented in reva
 		},
@@ -361,8 +361,8 @@ var testCases = []struct {
 	}, {
 		Alias: "File purged",
 		SystemEvent: events.ItemPurged{
-			FileID: reference("sto-123", "iid-123", "./item"),
-			Owner:  userID("uid-123"), // NOTE: owner not yet implemented in reva
+			Ref:   reference("sto-123", "iid-123", "./item"),
+			Owner: userID("uid-123"), // NOTE: owner not yet implemented in reva
 		},
 		CheckAuditEvent: func(t *testing.T, b []byte) {
 			ev := types.AuditEventFilePurged{}
@@ -376,7 +376,7 @@ var testCases = []struct {
 	}, {
 		Alias: "File restored",
 		SystemEvent: events.ItemRestored{
-			FileID:       reference("sto-123", "iid-123", "./item"),
+			Ref:          reference("sto-123", "iid-123", "./item"),
 			Owner:        userID("uid-123"), // NOTE: owner not yet implemented in reva
 			OldReference: reference("sto-123", "sto-123!iid-123/item", "./oldpath"),
 			Key:          "",
@@ -396,9 +396,9 @@ var testCases = []struct {
 	}, {
 		Alias: "File version restored",
 		SystemEvent: events.FileVersionRestored{
-			FileID: reference("sto-123", "iid-123", "./item"),
-			Owner:  userID("uid-123"), // NOTE: owner not yet implemented in reva
-			Key:    "v1",
+			Ref:   reference("sto-123", "iid-123", "./item"),
+			Owner: userID("uid-123"), // NOTE: owner not yet implemented in reva
+			Key:   "v1",
 		},
 		CheckAuditEvent: func(t *testing.T, b []byte) {
 			ev := types.AuditEventFileVersionRestored{}
diff --git a/extensions/audit/pkg/types/conversion.go b/extensions/audit/pkg/types/conversion.go
index 5c3f3f1c85..fbb789ea59 100644
--- a/extensions/audit/pkg/types/conversion.go
+++ b/extensions/audit/pkg/types/conversion.go
@@ -234,7 +234,7 @@ func FilesAuditEvent(base AuditEvent, itemid, owner, path string) AuditEventFile
 
 // FileUploaded converts a FileUploaded event to an AuditEventFileCreated
 func FileUploaded(ev events.FileUploaded) AuditEventFileCreated {
-	iid, path, uid := extractFileDetails(ev.FileID, ev.Owner)
+	iid, path, uid := extractFileDetails(ev.Ref, ev.Owner)
 	base := BasicAuditEvent(uid, "", MessageFileCreated(iid), ActionFileCreated)
 	return AuditEventFileCreated{
 		AuditEventFiles: FilesAuditEvent(base, iid, uid, path),
@@ -243,7 +243,7 @@ func FileUploaded(ev events.FileUploaded) AuditEventFileCreated {
 
 // FileDownloaded converts a FileDownloaded event to an AuditEventFileRead
 func FileDownloaded(ev events.FileDownloaded) AuditEventFileRead {
-	iid, path, uid := extractFileDetails(ev.FileID, ev.Owner)
+	iid, path, uid := extractFileDetails(ev.Ref, ev.Owner)
 	base := BasicAuditEvent(uid, "", MessageFileRead(iid), ActionFileRead)
 	return AuditEventFileRead{
 		AuditEventFiles: FilesAuditEvent(base, iid, uid, path),
@@ -252,7 +252,7 @@ func FileDownloaded(ev events.FileDownloaded) AuditEventFileRead {
 
 // ItemMoved converts a ItemMoved event to an AuditEventFileRenamed
 func ItemMoved(ev events.ItemMoved) AuditEventFileRenamed {
-	iid, path, uid := extractFileDetails(ev.FileID, ev.Owner)
+	iid, path, uid := extractFileDetails(ev.Ref, ev.Owner)
 
 	oldpath := ""
 	if ev.OldReference != nil {
@@ -268,7 +268,7 @@ func ItemMoved(ev events.ItemMoved) AuditEventFileRenamed {
 
 // ItemTrashed converts a ItemTrashed event to an AuditEventFileDeleted
 func ItemTrashed(ev events.ItemTrashed) AuditEventFileDeleted {
-	iid, path, uid := extractFileDetails(ev.FileID, ev.Owner)
+	iid, path, uid := extractFileDetails(ev.Ref, ev.Owner)
 	base := BasicAuditEvent(uid, "", MessageFileTrashed(iid), ActionFileTrashed)
 	return AuditEventFileDeleted{
 		AuditEventFiles: FilesAuditEvent(base, iid, uid, path),
@@ -277,7 +277,7 @@ func ItemTrashed(ev events.ItemTrashed) AuditEventFileDeleted {
 
 // ItemPurged converts a ItemPurged event to an AuditEventFilePurged
 func ItemPurged(ev events.ItemPurged) AuditEventFilePurged {
-	iid, path, uid := extractFileDetails(ev.FileID, ev.Owner)
+	iid, path, uid := extractFileDetails(ev.Ref, ev.Owner)
 	base := BasicAuditEvent(uid, "", MessageFilePurged(iid), ActionFilePurged)
 	return AuditEventFilePurged{
 		AuditEventFiles: FilesAuditEvent(base, iid, uid, path),
@@ -286,7 +286,7 @@ func ItemPurged(ev events.ItemPurged) AuditEventFilePurged {
 
 // ItemRestored converts a ItemRestored event to an AuditEventFileRestored
 func ItemRestored(ev events.ItemRestored) AuditEventFileRestored {
-	iid, path, uid := extractFileDetails(ev.FileID, ev.Owner)
+	iid, path, uid := extractFileDetails(ev.Ref, ev.Owner)
 
 	oldpath := ""
 	if ev.OldReference != nil {
@@ -302,7 +302,7 @@ func ItemRestored(ev events.ItemRestored) AuditEventFileRestored {
 
 // FileVersionRestored converts a FileVersionRestored event to an AuditEventFileVersionRestored
 func FileVersionRestored(ev events.FileVersionRestored) AuditEventFileVersionRestored {
-	iid, path, uid := extractFileDetails(ev.FileID, ev.Owner)
+	iid, path, uid := extractFileDetails(ev.Ref, ev.Owner)
 	base := BasicAuditEvent(uid, "", MessageFileVersionRestored(iid, ev.Key), ActionFileVersionRestored)
 	return AuditEventFileVersionRestored{
 		AuditEventFiles: FilesAuditEvent(base, iid, uid, path),