diff --git a/noise.graphql b/noise.graphql
index 4e83da0..192776c 100644
--- a/noise.graphql
+++ b/noise.graphql
@@ -18,14 +18,14 @@ type User {
 
 # All account preferences for a single user
 type UserPreferences {
-    privacyPreference: PrivacyPreference!
-    notificationPreference: NotificationPreference!
-    securityPreference: SecurityPreference!
+    privacyPreferences: PrivacyPreferences!
+    notificationPreferences: NotificationPreferences!
+    securityPreferences: SecurityPreferences!
     # TODO: external servers
-    externalServersPreference: ExternalServersPreference!
+    externalServersPreferences: ExternalServersPreferences!
 }
 
-type PrivacyPreference {
+type PrivacyPreferences {
     # Discovery on other servers
     discovery: RestrictionPolicy!
     discoveryUserLimit: [String!]
@@ -45,12 +45,12 @@ type PrivacyPreference {
     infoServerLimit: [Url!]
 }
 
-type NotificationPreference {
+type NotificationPreferences {
     lockDetails: Boolean!
     doNotDisturb: Boolean!
 }
 
-type SecurityPreference {
+type SecurityPreferences {
     # One-purpose-passwords
     accountTokens: [ID!]!
 
@@ -58,8 +58,8 @@ type SecurityPreference {
     passwordHash: String!
 }
 
-type ExternalServersPreference {
-    privacyPreference: PrivacyPreference
+type ExternalServersPreferences {
+    privacyPreference: PrivacyPreferences
     externalServers: RestrictionPolicy!
     externalServersLimit: [Url!]
 }