diff --git a/app/src/main/java/info/nightscout/androidaps/MainActivity.java b/app/src/main/java/info/nightscout/androidaps/MainActivity.java
index 5aae374ccb..01961df937 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainActivity.java
@@ -18,9 +18,9 @@ import java.util.ArrayList;
 import info.nightscout.androidaps.events.EventRefreshGui;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderFragment;
 import info.nightscout.androidaps.plugins.LowSuspend.LowSuspendFragment;
+import info.nightscout.androidaps.plugins.NSProfileViewer.NSProfileViewerFragment;
 import info.nightscout.androidaps.plugins.OpenAPSMA.OpenAPSMAFragment;
 import info.nightscout.androidaps.plugins.Overview.OverviewFragment;
-import info.nightscout.androidaps.plugins.ProfileViewer.ProfileViewerFragment;
 import info.nightscout.androidaps.plugins.TempBasals.TempBasalsFragment;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsFragment;
 import info.nightscout.androidaps.plugins.VirtualPump.VirtualPumpFragment;
@@ -53,7 +53,7 @@ public class MainActivity extends AppCompatActivity {
         pluginsList.add(OpenAPSMAFragment.newInstance());
         pluginsList.add(treatmentsFragment = TreatmentsFragment.newInstance());
         pluginsList.add(tempBasalsFragment = TempBasalsFragment.newInstance());
-        pluginsList.add(ProfileViewerFragment.newInstance());
+        pluginsList.add(NSProfileViewerFragment.newInstance());
         pluginsList.add(ObjectivesFragment.newInstance());
         pluginsList.add(ConfigBuilderFragment.newInstance());
 
@@ -64,7 +64,7 @@ public class MainActivity extends AppCompatActivity {
         pageAdapter.registerNewFragment(OpenAPSMAFragment.newInstance());
         pageAdapter.registerNewFragment(treatmentsFragment = TreatmentsFragment.newInstance());
         pageAdapter.registerNewFragment(tempBasalsFragment = TempBasalsFragment.newInstance());
-        pageAdapter.registerNewFragment(ProfileViewerFragment.newInstance());
+        pageAdapter.registerNewFragment(NSProfileViewerFragment.newInstance());
         pageAdapter.registerNewFragment(ObjectivesFragment.newInstance());
         pageAdapter.registerNewFragment(ConfigBuilderFragment.newInstance());
 */
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileViewer/ProfileViewerFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSProfileViewer/NSProfileViewerFragment.java
similarity index 86%
rename from app/src/main/java/info/nightscout/androidaps/plugins/ProfileViewer/ProfileViewerFragment.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/NSProfileViewer/NSProfileViewerFragment.java
index 9ff4f7aa78..352b37eca3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileViewer/ProfileViewerFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSProfileViewer/NSProfileViewerFragment.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.ProfileViewer;
+package info.nightscout.androidaps.plugins.NSProfileViewer;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -21,8 +21,8 @@ import info.nightscout.androidaps.events.EventNewBasalProfile;
 import info.nightscout.androidaps.plugins.PluginBase;
 import info.nightscout.client.data.NSProfile;
 
-public class ProfileViewerFragment extends Fragment implements PluginBase {
-    private static Logger log = LoggerFactory.getLogger(ProfileViewerFragment.class);
+public class NSProfileViewerFragment extends Fragment implements PluginBase {
+    private static Logger log = LoggerFactory.getLogger(NSProfileViewerFragment.class);
 
     private static TextView noProfile;
     private static TextView units;
@@ -73,11 +73,6 @@ public class ProfileViewerFragment extends Fragment implements PluginBase {
         return PluginBase.PROFILE;
     }
 
-    public static ProfileViewerFragment newInstance(String param1, String param2) {
-        ProfileViewerFragment fragment = new ProfileViewerFragment();
-        return fragment;
-    }
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -87,7 +82,7 @@ public class ProfileViewerFragment extends Fragment implements PluginBase {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-        View layout = inflater.inflate(R.layout.profileviewer_fragment, container, false);
+        View layout = inflater.inflate(R.layout.nsprofileviewer_fragment, container, false);
 
         noProfile = (TextView) layout.findViewById(R.id.profileview_noprofile);
         units = (TextView) layout.findViewById(R.id.profileview_units);
@@ -102,8 +97,8 @@ public class ProfileViewerFragment extends Fragment implements PluginBase {
         return layout;
     }
 
-    public static ProfileViewerFragment newInstance() {
-        ProfileViewerFragment fragment = new ProfileViewerFragment();
+    public static NSProfileViewerFragment newInstance() {
+        NSProfileViewerFragment fragment = new NSProfileViewerFragment();
         return fragment;
     }
 
diff --git a/app/src/main/res/layout/profileviewer_fragment.xml b/app/src/main/res/layout/nsprofileviewer_fragment.xml
similarity index 88%
rename from app/src/main/res/layout/profileviewer_fragment.xml
rename to app/src/main/res/layout/nsprofileviewer_fragment.xml
index 8449263575..cc14a3f88d 100644
--- a/app/src/main/res/layout/profileviewer_fragment.xml
+++ b/app/src/main/res/layout/nsprofileviewer_fragment.xml
@@ -2,7 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".plugins.ProfileViewer.ProfileViewerFragment">
+    tools:context=".plugins.NSProfileViewer.NSProfileViewerFragment">
 
     <ScrollView
         android:layout_width="match_parent"
@@ -17,7 +17,7 @@
                 android:id="@+id/profileview_noprofile"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/profileview_noprofile_text"
+                android:text="@string/nsprofileview_noprofile_text"
                 android:textAppearance="?android:attr/textAppearanceLarge"
                 android:textColor="@android:color/holo_red_light"
                 android:textStyle="bold"
@@ -26,7 +26,7 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/profileview_activeprofile_label"
+                android:text="@string/nsprofileview_activeprofile_label"
                 android:textAppearance="?android:attr/textAppearanceLarge"
                 android:layout_marginLeft="10dp" />
 
@@ -39,7 +39,7 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/profileview_units_label"
+                android:text="@string/nsprofileview_units_label"
                 android:textAppearance="?android:attr/textAppearanceLarge"
                 android:layout_marginLeft="10dp" />
 
@@ -52,7 +52,7 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/profileview_dia_label"
+                android:text="@string/nsprofileview_dia_label"
                 android:textAppearance="?android:attr/textAppearanceLarge"
                 android:layout_marginLeft="10dp" />
 
@@ -65,7 +65,7 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/profileview_ic_label"
+                android:text="@string/nsprofileview_ic_label"
                 android:textAppearance="?android:attr/textAppearanceLarge"
                 android:layout_marginLeft="10dp" />
 
@@ -78,7 +78,7 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/profileview_isf_label"
+                android:text="@string/nsprofileview_isf_label"
                 android:textAppearance="?android:attr/textAppearanceLarge"
                 android:layout_marginLeft="10dp" />
 
@@ -91,7 +91,7 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/profileview_basal_label"
+                android:text="@string/nsprofileview_basal_label"
                 android:textAppearance="?android:attr/textAppearanceLarge"
                 android:layout_marginLeft="10dp" />
 
@@ -104,7 +104,7 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/profileview_target_label"
+                android:text="@string/nsprofileview_target_label"
                 android:textAppearance="?android:attr/textAppearanceLarge"
                 android:layout_marginLeft="10dp" />
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 79ecc20a63..471163ea20 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -25,13 +25,14 @@
     <string name="objectives_gate_label_string">Gate:</string>
     <string name="objectives_button_start">Start</string>
     <string name="objectives_button_verify">Verify</string>
-    <string name="profileview_dia_label">DIA:</string>
-    <string name="profileview_activeprofile_label">Active profile:</string>
-    <string name="profileview_ic_label">IC:</string>
-    <string name="profileview_isf_label">ISF:</string>
-    <string name="profileview_basal_label">Basal:</string>
-    <string name="profileview_target_label">Target:</string>
-    <string name="profileview_noprofile_text">NO PROFILE SET</string>
+    <string name="nsprofileview_units_label">Units:</string>
+    <string name="nsprofileview_dia_label">DIA:</string>
+    <string name="nsprofileview_activeprofile_label">Active profile:</string>
+    <string name="nsprofileview_ic_label">IC:</string>
+    <string name="nsprofileview_isf_label">ISF:</string>
+    <string name="nsprofileview_basal_label">Basal:</string>
+    <string name="nsprofileview_target_label">Target:</string>
+    <string name="nsprofileview_noprofile_text">NO PROFILE SET</string>
     <string name="treatments_insulin_label_string">Insulin:</string>
     <string name="treatments_carbs_label_string">Carbs:</string>
     <string name="treatments_iob_label_string">IOB:</string>
@@ -51,7 +52,6 @@
     <string name="treatments_wizard_unit_label">U</string>
     <string name="treatments_wizard_iob_label">IOB</string>
     <string name="treatments_wizard_total_label">TOTAL</string>
-    <string name="profileview_units_label">Units:</string>
     <string name="openapsma_run">Run now</string>
     <string name="vitualpump_label">VIRTUAL PUMP</string>
     <string name="virtualpump_basebasalrate_label">Base basal rate:</string>
@@ -93,7 +93,7 @@
     <string name="objectives">Objectives</string>
     <string name="openapsma">OpenAPS MA</string>
     <string name="overview">Overview</string>
-    <string name="profileviewer">Profile Viewer</string>
+    <string name="profileviewer">NS Profile</string>
     <string name="tempbasals">Temp Basals</string>
     <string name="treatments">Treatments</string>
     <string name="virtualpump">Virtual Pump</string>