diff --git a/ring-android/app/src/main/java/cx/ring/account/HomeAccountCreationFragment.java b/ring-android/app/src/main/java/cx/ring/account/HomeAccountCreationFragment.java
index 239d821d3c94125080289aa74ed77d995f20a446..c394ce98f9e9b4f219099e19083437e42e9aeb70 100644
--- a/ring-android/app/src/main/java/cx/ring/account/HomeAccountCreationFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/account/HomeAccountCreationFragment.java
@@ -92,7 +92,7 @@ public class HomeAccountCreationFragment extends BaseSupportFragment<HomeAccount
     public void goToAccountLink() {
         AccountCreationModelImpl ringAccountViewModel = new AccountCreationModelImpl();
         ringAccountViewModel.setLink(true);
-        Fragment fragment = RingLinkAccountFragment.newInstance(ringAccountViewModel);
+        Fragment fragment = JamiLinkAccountFragment.newInstance(ringAccountViewModel);
         replaceFragmentWithSlide(fragment, R.id.wizard_container);
     }
 
@@ -124,7 +124,7 @@ public class HomeAccountCreationFragment extends BaseSupportFragment<HomeAccount
                                 AccountCreationModelImpl ringAccountViewModel = new AccountCreationModelImpl();
                                 ringAccountViewModel.setLink(true);
                                 ringAccountViewModel.setArchive(file);
-                                Fragment fragment = RingLinkAccountFragment.newInstance(ringAccountViewModel);
+                                Fragment fragment = JamiLinkAccountFragment.newInstance(ringAccountViewModel);
                                 replaceFragmentWithSlide(fragment, R.id.wizard_container);
                             }, e-> {
                                 View v = getView();
diff --git a/ring-android/app/src/main/java/cx/ring/account/JamiAccountSummaryFragment.java b/ring-android/app/src/main/java/cx/ring/account/JamiAccountSummaryFragment.java
index d09cfd7105b550e9afe732641e8ac60cbecc1cb6..c4ed1a8bbae6eef8334950fb76f4e0acae50bdf1 100644
--- a/ring-android/app/src/main/java/cx/ring/account/JamiAccountSummaryFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/account/JamiAccountSummaryFragment.java
@@ -95,12 +95,12 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
 
-public class JamiAccountSummaryFragment extends BaseSupportFragment<RingAccountSummaryPresenter> implements
+public class JamiAccountSummaryFragment extends BaseSupportFragment<JamiAccountSummaryPresenter> implements
         RegisterNameDialog.RegisterNameDialogListener,
         RenameDeviceDialog.RenameDeviceListener,
         DeviceAdapter.DeviceRevocationListener,
         ConfirmRevocationDialog.ConfirmRevocationListener,
-        RingAccountSummaryView, ChangePasswordDialog.PasswordChangedListener,
+        JamiAccountSummaryView, ChangePasswordDialog.PasswordChangedListener,
         BackupAccountDialog.UnlockAccountListener,
         ViewTreeObserver.OnScrollChangedListener {
 
diff --git a/ring-android/app/src/main/java/cx/ring/account/RingLinkAccountFragment.java b/ring-android/app/src/main/java/cx/ring/account/JamiLinkAccountFragment.java
similarity index 90%
rename from ring-android/app/src/main/java/cx/ring/account/RingLinkAccountFragment.java
rename to ring-android/app/src/main/java/cx/ring/account/JamiLinkAccountFragment.java
index 2d76156809890531e394c75652ce97e81507f8d6..c408502ec8053bc4357b0a518a86605eeacd3635 100644
--- a/ring-android/app/src/main/java/cx/ring/account/RingLinkAccountFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/account/JamiLinkAccountFragment.java
@@ -36,9 +36,9 @@ import cx.ring.dependencyinjection.JamiInjectionComponent;
 import cx.ring.mvp.BaseSupportFragment;
 import cx.ring.mvp.AccountCreationModel;
 
-public class RingLinkAccountFragment extends BaseSupportFragment<RingLinkAccountPresenter> implements RingLinkAccountView {
+public class JamiLinkAccountFragment extends BaseSupportFragment<JamiLinkAccountPresenter> implements JamiLinkAccountView {
 
-    public static final String TAG = RingLinkAccountFragment.class.getSimpleName();
+    public static final String TAG = JamiLinkAccountFragment.class.getSimpleName();
 
     @BindView(R.id.pin_box)
     protected ViewGroup mPinBox;
@@ -57,8 +57,8 @@ public class RingLinkAccountFragment extends BaseSupportFragment<RingLinkAccount
 
     private AccountCreationModel model;
 
-    public static RingLinkAccountFragment newInstance(AccountCreationModelImpl ringAccountViewModel) {
-        RingLinkAccountFragment fragment = new RingLinkAccountFragment();
+    public static JamiLinkAccountFragment newInstance(AccountCreationModelImpl ringAccountViewModel) {
+        JamiLinkAccountFragment fragment = new JamiLinkAccountFragment();
         fragment.model = ringAccountViewModel;
         return fragment;
     }
@@ -74,7 +74,7 @@ public class RingLinkAccountFragment extends BaseSupportFragment<RingLinkAccount
     }
 
     @Override
-    protected void initPresenter(RingLinkAccountPresenter presenter) {
+    protected void initPresenter(JamiLinkAccountPresenter presenter) {
         presenter.init(model);
     }
 
diff --git a/ring-android/app/src/main/java/cx/ring/dependencyinjection/JamiInjectionComponent.java b/ring-android/app/src/main/java/cx/ring/dependencyinjection/JamiInjectionComponent.java
index e09e9eb7bd96d0857def962c41fc74fad5dd4912..3f383b83e4a73e3d03866a046852a172b7007e52 100755
--- a/ring-android/app/src/main/java/cx/ring/dependencyinjection/JamiInjectionComponent.java
+++ b/ring-android/app/src/main/java/cx/ring/dependencyinjection/JamiInjectionComponent.java
@@ -30,7 +30,7 @@ import cx.ring.account.ProfileCreationFragment;
 import cx.ring.account.RegisterNameDialog;
 import cx.ring.account.JamiAccountCreationFragment;
 import cx.ring.account.JamiAccountSummaryFragment;
-import cx.ring.account.RingLinkAccountFragment;
+import cx.ring.account.JamiLinkAccountFragment;
 import cx.ring.application.JamiApplication;
 import cx.ring.client.ContactDetailsActivity;
 import cx.ring.client.HomeActivity;
@@ -76,7 +76,7 @@ import cx.ring.tv.account.TVHomeAccountCreationFragment;
 import cx.ring.tv.account.TVProfileCreationFragment;
 import cx.ring.tv.account.TVProfileEditingFragment;
 import cx.ring.tv.account.TVJamiAccountCreationFragment;
-import cx.ring.tv.account.TVRingLinkAccountFragment;
+import cx.ring.tv.account.TVJamiLinkAccountFragment;
 import cx.ring.tv.account.TVSettingsFragment;
 import cx.ring.tv.account.TVShareFragment;
 import cx.ring.tv.call.TVCallActivity;
@@ -172,7 +172,7 @@ public interface JamiInjectionComponent {
 
     void inject(HomeAccountCreationFragment fragment);
 
-    void inject(RingLinkAccountFragment fragment);
+    void inject(JamiLinkAccountFragment fragment);
 
     void inject(JamiAccountConnectFragment fragment);
 
@@ -197,7 +197,7 @@ public interface JamiInjectionComponent {
 
     void inject(TVJamiAccountCreationFragment fragment);
 
-    void inject(TVRingLinkAccountFragment fragment);
+    void inject(TVJamiLinkAccountFragment fragment);
 
     void inject(TVAccountExport fragment);
 
diff --git a/ring-android/app/src/main/java/cx/ring/tv/account/RingGuidedStepFragment.java b/ring-android/app/src/main/java/cx/ring/tv/account/JamiGuidedStepFragment.java
similarity index 93%
rename from ring-android/app/src/main/java/cx/ring/tv/account/RingGuidedStepFragment.java
rename to ring-android/app/src/main/java/cx/ring/tv/account/JamiGuidedStepFragment.java
index 737fc181f4063f43f3a8a6087541c65f5d814491..1f12bcd501ecca17aec45b3c20633630c6509e99 100644
--- a/ring-android/app/src/main/java/cx/ring/tv/account/RingGuidedStepFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/tv/account/JamiGuidedStepFragment.java
@@ -31,13 +31,19 @@ import javax.inject.Inject;
 
 import cx.ring.mvp.RootPresenter;
 
-public abstract class RingGuidedStepFragment<T extends RootPresenter> extends GuidedStepSupportFragment {
+public abstract class JamiGuidedStepFragment<T extends RootPresenter> extends GuidedStepSupportFragment {
 
-    protected static final String TAG = RingGuidedStepFragment.class.getSimpleName();
+    protected static final String TAG = JamiGuidedStepFragment.class.getSimpleName();
 
     @Inject
     protected T presenter;
 
+    protected static void addAction(Context context, List<GuidedAction> actions, long id, int title) {
+        actions.add(new GuidedAction.Builder(context)
+                .id(id)
+                .title(title)
+                .build());
+    }
     protected static void addAction(Context context, List<GuidedAction> actions, long id, String title, String desc) {
         actions.add(new GuidedAction.Builder(context)
                 .id(id)
diff --git a/ring-android/app/src/main/java/cx/ring/tv/account/TVAccountExport.java b/ring-android/app/src/main/java/cx/ring/tv/account/TVAccountExport.java
index 75c60753ae18764b4cd1b2908be6f2d9dce3b5ff..a44d6d4ea34479e81143916857004756cb3b478b 100644
--- a/ring-android/app/src/main/java/cx/ring/tv/account/TVAccountExport.java
+++ b/ring-android/app/src/main/java/cx/ring/tv/account/TVAccountExport.java
@@ -43,15 +43,15 @@ import java.util.List;
 import java.util.Map;
 
 import cx.ring.R;
-import cx.ring.account.RingAccountSummaryPresenter;
-import cx.ring.account.RingAccountSummaryView;
+import cx.ring.account.JamiAccountSummaryPresenter;
+import cx.ring.account.JamiAccountSummaryView;
 import cx.ring.application.JamiApplication;
 import cx.ring.model.Account;
 import cx.ring.utils.AndroidFileUtils;
 
 public class TVAccountExport
-        extends RingGuidedStepFragment<RingAccountSummaryPresenter>
-        implements RingAccountSummaryView {
+        extends JamiGuidedStepFragment<JamiAccountSummaryPresenter>
+        implements JamiAccountSummaryView {
 
     private static final long PASSWORD = 1L;
     private ProgressDialog mWaitDialog;
diff --git a/ring-android/app/src/main/java/cx/ring/tv/account/TVHomeAccountCreationFragment.java b/ring-android/app/src/main/java/cx/ring/tv/account/TVHomeAccountCreationFragment.java
index 50f45f343151e6c9a8981f7f6f8eb42333bc01ea..1e364c3f37842426609b10f5f22d9e889f3a8177 100644
--- a/ring-android/app/src/main/java/cx/ring/tv/account/TVHomeAccountCreationFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/tv/account/TVHomeAccountCreationFragment.java
@@ -34,7 +34,7 @@ import cx.ring.account.HomeAccountCreationView;
 import cx.ring.application.JamiApplication;
 
 public class TVHomeAccountCreationFragment
-        extends RingGuidedStepFragment<HomeAccountCreationPresenter>
+        extends JamiGuidedStepFragment<HomeAccountCreationPresenter>
         implements HomeAccountCreationView {
 
     private static final int LINK_ACCOUNT = 0;
@@ -58,7 +58,7 @@ public class TVHomeAccountCreationFragment
     public void goToAccountLink() {
         AccountCreationModelImpl ringAccountViewModel = new AccountCreationModelImpl();
         ringAccountViewModel.setLink(true);
-        GuidedStepSupportFragment.add(getFragmentManager(), TVRingLinkAccountFragment.newInstance(ringAccountViewModel));
+        GuidedStepSupportFragment.add(getFragmentManager(), TVJamiLinkAccountFragment.newInstance(ringAccountViewModel));
     }
 
     @Override
diff --git a/ring-android/app/src/main/java/cx/ring/tv/account/TVJamiAccountCreationFragment.java b/ring-android/app/src/main/java/cx/ring/tv/account/TVJamiAccountCreationFragment.java
index 9a5336eca64a60d458f1c3879c3b68950131b69f..5a8cd74b5fd5d57cb9ae661c9ef8dac4d50c8de3 100644
--- a/ring-android/app/src/main/java/cx/ring/tv/account/TVJamiAccountCreationFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/tv/account/TVJamiAccountCreationFragment.java
@@ -41,7 +41,7 @@ import cx.ring.utils.Log;
 import cx.ring.utils.StringUtils;
 
 public class TVJamiAccountCreationFragment
-        extends RingGuidedStepFragment<JamiAccountCreationPresenter>
+        extends JamiGuidedStepFragment<JamiAccountCreationPresenter>
         implements JamiAccountCreationView {
 
     private static final String TAG = TVJamiAccountCreationFragment.class.getSimpleName();
diff --git a/ring-android/app/src/main/java/cx/ring/tv/account/TVRingLinkAccountFragment.java b/ring-android/app/src/main/java/cx/ring/tv/account/TVJamiLinkAccountFragment.java
similarity index 92%
rename from ring-android/app/src/main/java/cx/ring/tv/account/TVRingLinkAccountFragment.java
rename to ring-android/app/src/main/java/cx/ring/tv/account/TVJamiLinkAccountFragment.java
index af91933c83a3401b4d0363121a8cfb73cfa91441..f3051c59a40ba4f86d3ba92041b9918ef6ecca14 100644
--- a/ring-android/app/src/main/java/cx/ring/tv/account/TVRingLinkAccountFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/tv/account/TVJamiLinkAccountFragment.java
@@ -29,24 +29,24 @@ import java.util.List;
 
 import cx.ring.R;
 import cx.ring.account.AccountCreationModelImpl;
-import cx.ring.account.RingLinkAccountPresenter;
-import cx.ring.account.RingLinkAccountView;
+import cx.ring.account.JamiLinkAccountPresenter;
+import cx.ring.account.JamiLinkAccountView;
 import cx.ring.application.JamiApplication;
 import cx.ring.mvp.AccountCreationModel;
 import cx.ring.utils.StringUtils;
 
-public class TVRingLinkAccountFragment extends RingGuidedStepFragment<RingLinkAccountPresenter>
-        implements RingLinkAccountView {
+public class TVJamiLinkAccountFragment extends JamiGuidedStepFragment<JamiLinkAccountPresenter>
+        implements JamiLinkAccountView {
     private static final long PASSWORD = 1L;
     private static final long PIN = 2L;
     private static final long LINK = 3L;
     private AccountCreationModelImpl model;
 
-    public TVRingLinkAccountFragment() {
+    public TVJamiLinkAccountFragment() {
     }
 
-    public static TVRingLinkAccountFragment newInstance(AccountCreationModelImpl ringAccountViewModel) {
-        TVRingLinkAccountFragment fragment = new TVRingLinkAccountFragment();
+    public static TVJamiLinkAccountFragment newInstance(AccountCreationModelImpl ringAccountViewModel) {
+        TVJamiLinkAccountFragment fragment = new TVJamiLinkAccountFragment();
         fragment.model = ringAccountViewModel;
         return fragment;
     }
diff --git a/ring-android/app/src/main/java/cx/ring/tv/account/TVProfileCreationFragment.java b/ring-android/app/src/main/java/cx/ring/tv/account/TVProfileCreationFragment.java
index 65e6c7c8dfb87eb20b82b01f6589d7c36aa55103..88efde7ac67f2f2cab34c31101cae2ea299bbbc3 100644
--- a/ring-android/app/src/main/java/cx/ring/tv/account/TVProfileCreationFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/tv/account/TVProfileCreationFragment.java
@@ -55,7 +55,7 @@ import cx.ring.utils.AndroidFileUtils;
 import cx.ring.views.AvatarDrawable;
 import io.reactivex.Single;
 
-public class TVProfileCreationFragment extends RingGuidedStepFragment<ProfileCreationPresenter>
+public class TVProfileCreationFragment extends JamiGuidedStepFragment<ProfileCreationPresenter>
         implements ProfileCreationView {
 
     private static final int USER_NAME = 1;
diff --git a/ring-android/app/src/main/java/cx/ring/tv/account/TVProfileEditingFragment.java b/ring-android/app/src/main/java/cx/ring/tv/account/TVProfileEditingFragment.java
index af0f72a363e1d164439edd23158f222c94fc6d28..3ccc889a8716f0d5e1888d6ade1856016f3375eb 100644
--- a/ring-android/app/src/main/java/cx/ring/tv/account/TVProfileEditingFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/tv/account/TVProfileEditingFragment.java
@@ -56,7 +56,7 @@ import io.reactivex.Single;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
 
-public class TVProfileEditingFragment extends RingGuidedStepFragment<HomeNavigationPresenter>
+public class TVProfileEditingFragment extends JamiGuidedStepFragment<HomeNavigationPresenter>
         implements HomeNavigationView {
 
     private static final int USER_NAME = 1;
diff --git a/ring-android/app/src/main/java/cx/ring/tv/contact/TVContactDetailPresenter.java b/ring-android/app/src/main/java/cx/ring/tv/contact/TVContactDetailPresenter.java
index 6a32667ad08eeafcac7baff0fcb585032ef97995..1b719a09c499abea1545058bf090d2ceae5cd887 100644
--- a/ring-android/app/src/main/java/cx/ring/tv/contact/TVContactDetailPresenter.java
+++ b/ring-android/app/src/main/java/cx/ring/tv/contact/TVContactDetailPresenter.java
@@ -51,7 +51,7 @@ public class TVContactDetailPresenter extends Presenter {
 
     }
 
-    public class CustomViewHolder extends Presenter.ViewHolder {
+    public static class CustomViewHolder extends Presenter.ViewHolder {
 
         public CustomViewHolder(View view) {
             super(view);
diff --git a/ring-android/libringclient/src/main/java/cx/ring/account/RingAccountSummaryPresenter.java b/ring-android/libringclient/src/main/java/cx/ring/account/JamiAccountSummaryPresenter.java
similarity index 94%
rename from ring-android/libringclient/src/main/java/cx/ring/account/RingAccountSummaryPresenter.java
rename to ring-android/libringclient/src/main/java/cx/ring/account/JamiAccountSummaryPresenter.java
index 911da027f5f782cbe4302bf3e1a3ccdc7bf0a520..dcf3185372f328ac2a7366010f6f647e8c4e6e73 100644
--- a/ring-android/libringclient/src/main/java/cx/ring/account/RingAccountSummaryPresenter.java
+++ b/ring-android/libringclient/src/main/java/cx/ring/account/JamiAccountSummaryPresenter.java
@@ -45,9 +45,9 @@ import io.reactivex.Scheduler;
 import io.reactivex.Single;
 import io.reactivex.schedulers.Schedulers;
 
-public class RingAccountSummaryPresenter extends RootPresenter<RingAccountSummaryView> {
+public class JamiAccountSummaryPresenter extends RootPresenter<JamiAccountSummaryView> {
 
-    private static final String TAG = RingAccountSummaryPresenter.class.getSimpleName();
+    private static final String TAG = JamiAccountSummaryPresenter.class.getSimpleName();
 
     private final DeviceRuntimeService mDeviceRuntimeService;
     private final HardwareService mHardwareService;
@@ -59,9 +59,9 @@ public class RingAccountSummaryPresenter extends RootPresenter<RingAccountSummar
     protected Scheduler mUiScheduler;
 
     @Inject
-    public RingAccountSummaryPresenter(AccountService accountService,
-                                        HardwareService hardwareService,
-                                        DeviceRuntimeService deviceRuntimeService) {
+    public JamiAccountSummaryPresenter(AccountService accountService,
+                                       HardwareService hardwareService,
+                                       DeviceRuntimeService deviceRuntimeService) {
         mAccountService = accountService;
         mHardwareService = hardwareService;
         mDeviceRuntimeService = deviceRuntimeService;
@@ -99,13 +99,13 @@ public class RingAccountSummaryPresenter extends RootPresenter<RingAccountSummar
     public void setAccountId(String accountID) {
         mCompositeDisposable.clear();
         mAccountID = accountID;
-        RingAccountSummaryView v = getView();
+        JamiAccountSummaryView v = getView();
         if (v != null)
             v.accountChanged(mAccountService.getAccount(mAccountID));
         mCompositeDisposable.add(mAccountService.getObservableAccountUpdates(mAccountID)
                 .observeOn(mUiScheduler)
                 .subscribe(account -> {
-                    RingAccountSummaryView view = getView();
+                    JamiAccountSummaryView view = getView();
                     if (view != null) {
                         view.accountChanged(account);
                     }
@@ -138,7 +138,7 @@ public class RingAccountSummaryPresenter extends RootPresenter<RingAccountSummar
     }
 
     public void changePassword(String oldPassword, String newPassword) {
-        RingAccountSummaryView view = getView();
+        JamiAccountSummaryView view = getView();
         if (view != null)
             view.showPasswordProgressDialog();
         mCompositeDisposable.add(mAccountService.setAccountPassword(mAccountID, oldPassword, newPassword)
diff --git a/ring-android/libringclient/src/main/java/cx/ring/account/RingAccountSummaryView.java b/ring-android/libringclient/src/main/java/cx/ring/account/JamiAccountSummaryView.java
similarity index 97%
rename from ring-android/libringclient/src/main/java/cx/ring/account/RingAccountSummaryView.java
rename to ring-android/libringclient/src/main/java/cx/ring/account/JamiAccountSummaryView.java
index 8863bb513248c6e8c1089f542620c7c3e5809069..1d4361b8403d56e5fecaf2c694fed70e7e1db4f1 100644
--- a/ring-android/libringclient/src/main/java/cx/ring/account/RingAccountSummaryView.java
+++ b/ring-android/libringclient/src/main/java/cx/ring/account/JamiAccountSummaryView.java
@@ -24,7 +24,7 @@ import java.util.Map;
 
 import cx.ring.model.Account;
 
-public interface RingAccountSummaryView {
+public interface JamiAccountSummaryView {
 
     void showExportingProgressDialog();
 
diff --git a/ring-android/libringclient/src/main/java/cx/ring/account/RingLinkAccountPresenter.java b/ring-android/libringclient/src/main/java/cx/ring/account/JamiLinkAccountPresenter.java
similarity index 93%
rename from ring-android/libringclient/src/main/java/cx/ring/account/RingLinkAccountPresenter.java
rename to ring-android/libringclient/src/main/java/cx/ring/account/JamiLinkAccountPresenter.java
index cfa6ed898de3f8f62d9f0d7c83ac17e4b4ac0338..ccb4e2959072f648f58f4358f8a542020b8fa8c3 100644
--- a/ring-android/libringclient/src/main/java/cx/ring/account/RingLinkAccountPresenter.java
+++ b/ring-android/libringclient/src/main/java/cx/ring/account/JamiLinkAccountPresenter.java
@@ -24,12 +24,12 @@ import javax.inject.Inject;
 import cx.ring.mvp.AccountCreationModel;
 import cx.ring.mvp.RootPresenter;
 
-public class RingLinkAccountPresenter extends RootPresenter<RingLinkAccountView> {
+public class JamiLinkAccountPresenter extends RootPresenter<JamiLinkAccountView> {
 
     private AccountCreationModel mAccountCreationModel;
 
     @Inject
-    public RingLinkAccountPresenter() {
+    public JamiLinkAccountPresenter() {
     }
 
     public void init(AccountCreationModel accountCreationModel) {
@@ -40,7 +40,7 @@ public class RingLinkAccountPresenter extends RootPresenter<RingLinkAccountView>
         }
 
         boolean hasArchive = mAccountCreationModel.getArchive() != null;
-        RingLinkAccountView view = getView();
+        JamiLinkAccountView view = getView();
         if (view != null) {
             view.showPin(!hasArchive);
             view.enableLinkButton(hasArchive);
diff --git a/ring-android/libringclient/src/main/java/cx/ring/account/RingLinkAccountView.java b/ring-android/libringclient/src/main/java/cx/ring/account/JamiLinkAccountView.java
similarity index 96%
rename from ring-android/libringclient/src/main/java/cx/ring/account/RingLinkAccountView.java
rename to ring-android/libringclient/src/main/java/cx/ring/account/JamiLinkAccountView.java
index bc589b63a4f969c385fbbe81126b0c5bfb0bd71a..a1e961de9fedfaec0563d96fd8a2d17b2f50671e 100644
--- a/ring-android/libringclient/src/main/java/cx/ring/account/RingLinkAccountView.java
+++ b/ring-android/libringclient/src/main/java/cx/ring/account/JamiLinkAccountView.java
@@ -21,7 +21,7 @@ package cx.ring.account;
 
 import cx.ring.mvp.AccountCreationModel;
 
-public interface RingLinkAccountView {
+public interface JamiLinkAccountView {
 
     void enableLinkButton(boolean enable);