diff --git a/src/main/java/com/googlesource/gerrit/plugins/cookbook/client/ChangeScreenPreferencePanel.java b/src/main/java/com/googlesource/gerrit/plugins/cookbook/client/ChangeScreenPreferencePanel.java
index b610f87..47d05a9 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/cookbook/client/ChangeScreenPreferencePanel.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/cookbook/client/ChangeScreenPreferencePanel.java
@@ -14,7 +14,7 @@
 
 package com.googlesource.gerrit.plugins.cookbook.client;
 
-import com.google.gerrit.client.info.AccountPreferencesInfo;
+import com.google.gerrit.client.info.GeneralPreferences;
 import com.google.gerrit.plugin.client.Plugin;
 import com.google.gerrit.plugin.client.extension.Panel;
 import com.google.gerrit.plugin.client.rpc.RestApi;
@@ -50,9 +50,9 @@
 
   ChangeScreenPreferencePanel() {
     new RestApi("accounts").id("self").view("preferences")
-        .get(new AsyncCallback<AccountPreferencesInfo>() {
+        .get(new AsyncCallback<GeneralPreferences>() {
           @Override
-          public void onSuccess(AccountPreferencesInfo result) {
+          public void onSuccess(GeneralPreferences result) {
             display(result);
           }
 
@@ -63,7 +63,7 @@
         });
   }
 
-  private void display(final AccountPreferencesInfo info) {
+  private void display(final GeneralPreferences info) {
     Label heading = new Label(Plugin.get().getName() + " plugin");
     heading.setStyleName("smallHeading");
     add(heading);
@@ -120,9 +120,9 @@
         info.setUrlAliases(urlAliases);
 
         new RestApi("accounts").id("self").view("preferences")
-            .put(info, new AsyncCallback<AccountPreferencesInfo>() {
+            .put(info, new AsyncCallback<GeneralPreferences>() {
               @Override
-              public void onSuccess(AccountPreferencesInfo result) {
+              public void onSuccess(GeneralPreferences result) {
                 Plugin.get().refreshUserPreferences();
                 showSavedStatus();
               }
