diff --git a/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java b/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java
index 579c3ef028..79e721182c 100644
--- a/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java
+++ b/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java
@@ -22,7 +22,7 @@ import io.bitsquare.gui.Navigation;
 import io.bitsquare.gui.main.MainView;
 import io.bitsquare.gui.main.account.AccountView;
 import io.bitsquare.gui.main.account.content.changepassword.ChangePasswordView;
-import io.bitsquare.gui.main.account.content.fiat.FiatAccountView;
+import io.bitsquare.gui.main.account.content.irc.IrcAccountView;
 import io.bitsquare.gui.main.account.content.registration.RegistrationView;
 import io.bitsquare.gui.main.account.content.restrictions.RestrictionsView;
 import io.bitsquare.gui.main.account.content.seedwords.SeedWordsView;
@@ -52,7 +52,7 @@ public class AccountSettingsView extends ActivatableViewAndModel {
     private final ViewLoader viewLoader;
     private final Navigation navigation;
 
-    private MenuItem seedWords, password, restrictions, fiatAccount, registration;
+    private MenuItem seedWords, password, restrictions, ircAccount, registration;
     private Navigation.Listener listener;
 
     @FXML private VBox leftVBox;
@@ -78,7 +78,7 @@ public class AccountSettingsView extends ActivatableViewAndModel {
         seedWords = new MenuItem(navigation, toggleGroup, "Wallet seed", SeedWordsView.class);
         password = new MenuItem(navigation, toggleGroup, "Wallet password", ChangePasswordView.class);
         restrictions = new MenuItem(navigation, toggleGroup, "Arbitrator selection", RestrictionsView.class);
-        fiatAccount = new MenuItem(navigation, toggleGroup, "Payments account(s)", FiatAccountView.class);
+        ircAccount = new MenuItem(navigation, toggleGroup, "Payments account(s)", IrcAccountView.class);
         registration = new MenuItem(navigation, toggleGroup, "Renew your account", RegistrationView.class);
 
         seedWords.setDisable(true);
@@ -86,7 +86,7 @@ public class AccountSettingsView extends ActivatableViewAndModel {
         restrictions.setDisable(true);
         registration.setDisable(true);
 
-        leftVBox.getChildren().addAll(seedWords, password, restrictions, fiatAccount, registration);
+        leftVBox.getChildren().addAll(seedWords, password, restrictions, ircAccount, registration);
     }
 
     @Override
@@ -94,7 +94,7 @@ public class AccountSettingsView extends ActivatableViewAndModel {
         navigation.addListener(listener);
         ViewPath viewPath = navigation.getCurrentPath();
         if (viewPath.size() == 3 && viewPath.indexOf(AccountSettingsView.class) == 2) {
-            navigation.navigateTo(MainView.class, AccountView.class, AccountSettingsView.class, FiatAccountView.class);
+            navigation.navigateTo(MainView.class, AccountView.class, AccountSettingsView.class, IrcAccountView.class);
         }
         else if (viewPath.size() == 4 && viewPath.indexOf(AccountSettingsView.class) == 2) {
             loadView(viewPath.get(3));
@@ -118,7 +118,7 @@ public class AccountSettingsView extends ActivatableViewAndModel {
         if (viewClass == SeedWordsView.class) seedWords.setSelected(true);
         else if (viewClass == ChangePasswordView.class) password.setSelected(true);
         else if (viewClass == RestrictionsView.class) restrictions.setSelected(true);
-        else if (viewClass == FiatAccountView.class) fiatAccount.setSelected(true);
+        else if (viewClass == IrcAccountView.class) ircAccount.setSelected(true);
         else if (viewClass == RegistrationView.class) registration.setSelected(true);
         else throw new BitsquareException("Selecting main menu button for " + viewClass + " is not supported");
     }
diff --git a/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java b/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java
index e0aef7182a..7b07b83d98 100644
--- a/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java
+++ b/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java
@@ -19,7 +19,6 @@ package io.bitsquare.gui.main.account.setup;
 
 import io.bitsquare.gui.Navigation;
 import io.bitsquare.gui.main.MainView;
-import io.bitsquare.gui.main.account.content.fiat.FiatAccountView;
 import io.bitsquare.gui.main.account.content.irc.IrcAccountView;
 import io.bitsquare.gui.main.account.content.password.PasswordView;
 import io.bitsquare.gui.main.account.content.registration.RegistrationView;
@@ -47,7 +46,7 @@ public class AccountSetupWizard extends ActivatableView implements Wizard {
     @FXML VBox leftVBox;
     @FXML AnchorPane content;
 
-    private WizardItem seedWords, password, fiatAccount, restrictions, registration;
+    private WizardItem seedWords, password, ircAccount, restrictions, registration;
     private Navigation.Listener listener;
 
     private final ViewLoader viewLoader;
@@ -79,17 +78,17 @@ public class AccountSetupWizard extends ActivatableView implements Wizard {
                 password.onCompleted();
                 restrictions.show();
             }
-            else if (viewClass == FiatAccountView.class) {
+            else if (viewClass == IrcAccountView.class) {
                 seedWords.onCompleted();
                 password.onCompleted();
                 restrictions.onCompleted();
-                fiatAccount.show();
+                ircAccount.show();
             }
             else if (viewClass == RegistrationView.class) {
                 seedWords.onCompleted();
                 password.onCompleted();
                 restrictions.onCompleted();
-                fiatAccount.onCompleted();
+                ircAccount.onCompleted();
                 registration.show();
             }
         };
@@ -100,12 +99,12 @@ public class AccountSetupWizard extends ActivatableView implements Wizard {
                 "Setup password", "Protect your wallet with a password");
         restrictions = new WizardItem(RestrictionsView.class,
                 "Select arbitrators", "Select which arbitrators you want to use for trading");
-        fiatAccount = new WizardItem(FiatAccountView.class,
+        ircAccount = new WizardItem(IrcAccountView.class,
                 " Setup Payments account(s)", "You need to setup at least one payment account");
         registration = new WizardItem(RegistrationView.class,
                 "Register your account", "The registration in the Blockchain requires a payment of 0.0002 BTC");
 
-        leftVBox.getChildren().addAll(seedWords, password, restrictions, fiatAccount, registration);
+        leftVBox.getChildren().addAll(seedWords, password, restrictions, ircAccount, registration);
 
         seedWords.setDisable(true);
         password.setDisable(true);
@@ -116,7 +115,7 @@ public class AccountSetupWizard extends ActivatableView implements Wizard {
     @Override
     public void activate() {
         navigation.addListener(listener);
-        fiatAccount.show();
+        ircAccount.show();
     }
 
     @Override
@@ -136,10 +135,10 @@ public class AccountSetupWizard extends ActivatableView implements Wizard {
         }
         else if (currentStep instanceof RestrictionsView) {
             restrictions.onCompleted();
-            fiatAccount.show();
+            ircAccount.show();
         }
         else if (currentStep instanceof IrcAccountView) {
-            fiatAccount.onCompleted();
+            ircAccount.onCompleted();
             registration.show();
         }
         else if (currentStep instanceof RegistrationView) {