Cosmetics.
diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml
index d3128c1..5ebc2f8 100644
--- a/res/layout/activity_main.xml
+++ b/res/layout/activity_main.xml
@@ -12,14 +12,14 @@
         android:layout_height="wrap_content"
         android:layout_width="fill_parent"
         android:layout_weight="1"
-        android:text="@string/EPM_ON"
-        android:onClick="EpmOn" />
+        android:text="@string/EPM_ATTACH"
+        android:onClick="attachEpm" />
 
 <Button
         android:layout_height="wrap_content"
         android:layout_width="fill_parent"
         android:layout_weight="1"
-        android:text="@string/EPM_OFF"
-        android:onClick="EpmOff" />
+        android:text="@string/EPM_DETACH"
+        android:onClick="detachEpm" />
 
 </LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 59709a1..399110e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4,7 +4,7 @@
     <string name="app_name">AraEPM</string>
     <string name="action_settings">Settings</string>
     <string name="hello_world">Hello world!</string>
-    <string name="EPM_ON">EPM ON</string>
-    <string name="EPM_OFF">EPM OFF</string>
+    <string name="EPM_ATTACH">Attach EPM</string>
+    <string name="EPM_DETACH">Detach EPM</string>
 
 </resources>
diff --git a/src/com/projectara/araepm/MainActivity.java b/src/com/projectara/araepm/MainActivity.java
index 03c4156..5067760 100644
--- a/src/com/projectara/araepm/MainActivity.java
+++ b/src/com/projectara/araepm/MainActivity.java
@@ -42,9 +42,9 @@
     	super.onStop();
     }
 
-    public void EpmOn(View view) {
+    public void attachEpm(View view) {
         int rc;
-        Log.d(TAG, "EPM ON button pressed");
+        Log.d(TAG, "EPM attach button pressed");
         try {
             dme.writeDMEConfig(0,
                                true,
@@ -57,9 +57,9 @@
         }
     }
 
-    public void EpmOff(View view) {
+    public void detachEpm(View view) {
         int rc;
-        Log.d(TAG, "EPM OFF button pressed");
+        Log.d(TAG, "EPM detach button pressed");
         try {
             dme.writeDMEConfig(0, true,
                                DME.AttributeId.DME_MAILBOX,