diff --git a/android-app/src/main/res/layout/cpp_drag_button_0.xml b/android-app/src/main/res/layout/cpp_drag_button_0.xml
index ba60d159..a8626ece 100644
--- a/android-app/src/main/res/layout/cpp_drag_button_0.xml
+++ b/android-app/src/main/res/layout/cpp_drag_button_0.xml
@@ -23,7 +23,7 @@
   -->
 
 <org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													xmlns:c="http://schemas.android.com/apk/res-auto"
 													a:id="@id/cpp_button_0"
 													c:textUp="00"
 													a:text="0"
diff --git a/android-app/src/main/res/layout/cpp_drag_button_1.xml b/android-app/src/main/res/layout/cpp_drag_button_1.xml
index 93c495c6..0c174f15 100644
--- a/android-app/src/main/res/layout/cpp_drag_button_1.xml
+++ b/android-app/src/main/res/layout/cpp_drag_button_1.xml
@@ -23,7 +23,7 @@
   -->
 
 <org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													xmlns:c="http://schemas.android.com/apk/res-auto"
 													a:id="@id/cpp_button_1"
 													a:text="1"
 													c:textUp="sin"
diff --git a/android-app/src/main/res/layout/cpp_drag_button_2.xml b/android-app/src/main/res/layout/cpp_drag_button_2.xml
index 080fd483..1dc9c563 100644
--- a/android-app/src/main/res/layout/cpp_drag_button_2.xml
+++ b/android-app/src/main/res/layout/cpp_drag_button_2.xml
@@ -23,7 +23,7 @@
   -->
 
 <org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													xmlns:c="http://schemas.android.com/apk/res-auto"
 													a:id="@id/cpp_button_2"
 													a:text="2"
 													c:textUp="cos"
diff --git a/android-app/src/main/res/layout/cpp_drag_button_3.xml b/android-app/src/main/res/layout/cpp_drag_button_3.xml
index a6cc678d..dcb68869 100644
--- a/android-app/src/main/res/layout/cpp_drag_button_3.xml
+++ b/android-app/src/main/res/layout/cpp_drag_button_3.xml
@@ -23,7 +23,7 @@
   -->
 
 <org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													xmlns:c="http://schemas.android.com/apk/res-auto"
 													a:id="@id/cpp_button_3"
 													a:text="3"
 													c:textUp="tan"
diff --git a/android-app/src/main/res/layout/cpp_drag_button_4.xml b/android-app/src/main/res/layout/cpp_drag_button_4.xml
index 7e45f7a7..2308fe39 100644
--- a/android-app/src/main/res/layout/cpp_drag_button_4.xml
+++ b/android-app/src/main/res/layout/cpp_drag_button_4.xml
@@ -22,7 +22,7 @@
   ~ Site:  http://se.solovyev.org
   -->
 <org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													xmlns:c="http://schemas.android.com/apk/res-auto"
 													a:id="@id/cpp_button_4"
 													a:text="4"
 													c:textUp="x"
diff --git a/android-app/src/main/res/layout/cpp_drag_button_5.xml b/android-app/src/main/res/layout/cpp_drag_button_5.xml
index 37498bb2..75a0f9e6 100644
--- a/android-app/src/main/res/layout/cpp_drag_button_5.xml
+++ b/android-app/src/main/res/layout/cpp_drag_button_5.xml
@@ -22,7 +22,7 @@
   ~ Site:  http://se.solovyev.org
   -->
 <org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													xmlns:c="http://schemas.android.com/apk/res-auto"
 													a:id="@id/cpp_button_5"
 													a:text="5"
 													c:textUp="t"
diff --git a/android-app/src/main/res/layout/cpp_drag_button_6.xml b/android-app/src/main/res/layout/cpp_drag_button_6.xml
index f3a1cdc6..62d0e788 100644
--- a/android-app/src/main/res/layout/cpp_drag_button_6.xml
+++ b/android-app/src/main/res/layout/cpp_drag_button_6.xml
@@ -23,7 +23,7 @@
   -->
 
 <org.solovyev.android.calculator.view.AngleUnitsButton xmlns:a="http://schemas.android.com/apk/res/android"
-													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													   xmlns:c="http://schemas.android.com/apk/res-auto"
 													   c:textUp="deg"
 													   a:id="@id/cpp_button_6"
 													   a:text="6"
diff --git a/android-app/src/main/res/layout/cpp_drag_button_7.xml b/android-app/src/main/res/layout/cpp_drag_button_7.xml
index 60257a31..9786078b 100644
--- a/android-app/src/main/res/layout/cpp_drag_button_7.xml
+++ b/android-app/src/main/res/layout/cpp_drag_button_7.xml
@@ -23,7 +23,7 @@
   -->
 
 <org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													xmlns:c="http://schemas.android.com/apk/res-auto"
 													a:id="@id/cpp_button_7"
 													a:text="7"
 													c:textUp="i"
diff --git a/android-app/src/main/res/layout/cpp_drag_button_8.xml b/android-app/src/main/res/layout/cpp_drag_button_8.xml
index 67193ef2..64a5922b 100644
--- a/android-app/src/main/res/layout/cpp_drag_button_8.xml
+++ b/android-app/src/main/res/layout/cpp_drag_button_8.xml
@@ -23,7 +23,7 @@
   -->
 
 <org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													xmlns:c="http://schemas.android.com/apk/res-auto"
 													a:id="@id/cpp_button_8"
 													a:text="8"
 													c:textUp="ln"
diff --git a/android-app/src/main/res/layout/cpp_drag_button_9.xml b/android-app/src/main/res/layout/cpp_drag_button_9.xml
index 85954d7d..bbc13f4e 100644
--- a/android-app/src/main/res/layout/cpp_drag_button_9.xml
+++ b/android-app/src/main/res/layout/cpp_drag_button_9.xml
@@ -23,7 +23,7 @@
   -->
 
 <org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													xmlns:c="http://schemas.android.com/apk/res-auto"
 													a:id="@id/cpp_button_9"
 													a:text="9"
 													c:textDown="e"
diff --git a/android-app/src/main/res/layout/cpp_drag_button_clear.xml b/android-app/src/main/res/layout/cpp_drag_button_clear.xml
index 7fb20322..085b3e01 100644
--- a/android-app/src/main/res/layout/cpp_drag_button_clear.xml
+++ b/android-app/src/main/res/layout/cpp_drag_button_clear.xml
@@ -23,7 +23,7 @@
   -->
 
 <org.solovyev.android.calculator.view.NumeralBasesButton xmlns:a="http://schemas.android.com/apk/res/android"
-														 xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+														 xmlns:c="http://schemas.android.com/apk/res-auto"
 														 a:id="@id/cpp_button_clear"
 														 c:textUp="dec"
 														 a:text="@string/c_clear"
diff --git a/android-app/src/main/res/layout/cpp_drag_button_division.xml b/android-app/src/main/res/layout/cpp_drag_button_division.xml
index 365f8799..b41d5e75 100644
--- a/android-app/src/main/res/layout/cpp_drag_button_division.xml
+++ b/android-app/src/main/res/layout/cpp_drag_button_division.xml
@@ -23,7 +23,7 @@
   -->
 
 <org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													xmlns:c="http://schemas.android.com/apk/res-auto"
 													a:id="@id/cpp_button_division"
 													c:textUp="%"
 													a:text="/"
diff --git a/android-app/src/main/res/layout/cpp_drag_button_dot.xml b/android-app/src/main/res/layout/cpp_drag_button_dot.xml
index 1489b6ee..b2bd9776 100644
--- a/android-app/src/main/res/layout/cpp_drag_button_dot.xml
+++ b/android-app/src/main/res/layout/cpp_drag_button_dot.xml
@@ -23,7 +23,7 @@
   -->
 
 <org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													xmlns:c="http://schemas.android.com/apk/res-auto"
 													a:id="@id/cpp_button_period"
 													a:text="."
 													c:textUp=","
diff --git a/android-app/src/main/res/layout/cpp_drag_button_equals.xml b/android-app/src/main/res/layout/cpp_drag_button_equals.xml
index 649e14a3..383f49ff 100644
--- a/android-app/src/main/res/layout/cpp_drag_button_equals.xml
+++ b/android-app/src/main/res/layout/cpp_drag_button_equals.xml
@@ -22,7 +22,7 @@
   ~ Site:  http://se.solovyev.org
   -->
 <org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													xmlns:c="http://schemas.android.com/apk/res-auto"
 													a:id="@id/cpp_button_equals"
 													c:textUp="≡"
 													a:text="="
diff --git a/android-app/src/main/res/layout/cpp_drag_button_functions.xml b/android-app/src/main/res/layout/cpp_drag_button_functions.xml
index a1aa9a92..73d0693b 100644
--- a/android-app/src/main/res/layout/cpp_drag_button_functions.xml
+++ b/android-app/src/main/res/layout/cpp_drag_button_functions.xml
@@ -23,7 +23,7 @@
   -->
 
 <org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													xmlns:c="http://schemas.android.com/apk/res-auto"
 													a:id="@id/cpp_button_functions"
 													c:directionTextScale="0.5"
 													c:textUp="+ƒ"
diff --git a/android-app/src/main/res/layout/cpp_drag_button_history.xml b/android-app/src/main/res/layout/cpp_drag_button_history.xml
index 43af5eac..9452c7da 100644
--- a/android-app/src/main/res/layout/cpp_drag_button_history.xml
+++ b/android-app/src/main/res/layout/cpp_drag_button_history.xml
@@ -22,7 +22,7 @@
   ~ Site:  http://se.solovyev.org
   -->
 <org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													xmlns:c="http://schemas.android.com/apk/res-auto"
 													a:id="@id/cpp_button_history"
 													a:text="@string/c_history_button"
 													c:textUp="@string/c_undo"
diff --git a/android-app/src/main/res/layout/cpp_drag_button_left.xml b/android-app/src/main/res/layout/cpp_drag_button_left.xml
index b174eb97..ec00282e 100644
--- a/android-app/src/main/res/layout/cpp_drag_button_left.xml
+++ b/android-app/src/main/res/layout/cpp_drag_button_left.xml
@@ -23,7 +23,7 @@
   -->
 
 <org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													xmlns:c="http://schemas.android.com/apk/res-auto"
 													a:id="@id/cpp_button_left"
 													c:textUp="◁◁"
 													a:text="◁"
diff --git a/android-app/src/main/res/layout/cpp_drag_button_multiplication.xml b/android-app/src/main/res/layout/cpp_drag_button_multiplication.xml
index 1010ae9c..15ff74dc 100644
--- a/android-app/src/main/res/layout/cpp_drag_button_multiplication.xml
+++ b/android-app/src/main/res/layout/cpp_drag_button_multiplication.xml
@@ -23,7 +23,7 @@
   -->
 
 <org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													xmlns:c="http://schemas.android.com/apk/res-auto"
 													a:id="@id/cpp_button_multiplication"
 													a:text="×"
 													c:textUp="^"
diff --git a/android-app/src/main/res/layout/cpp_drag_button_plus.xml b/android-app/src/main/res/layout/cpp_drag_button_plus.xml
index 9aa89e05..05854f6a 100644
--- a/android-app/src/main/res/layout/cpp_drag_button_plus.xml
+++ b/android-app/src/main/res/layout/cpp_drag_button_plus.xml
@@ -22,7 +22,7 @@
   ~ Site:  http://se.solovyev.org
   -->
 <org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													xmlns:c="http://schemas.android.com/apk/res-auto"
 													a:id="@id/cpp_button_plus"
 													c:directionTextScale="0.5"
 													c:textUp="°"
diff --git a/android-app/src/main/res/layout/cpp_drag_button_right.xml b/android-app/src/main/res/layout/cpp_drag_button_right.xml
index e781dcfb..89b1afd7 100644
--- a/android-app/src/main/res/layout/cpp_drag_button_right.xml
+++ b/android-app/src/main/res/layout/cpp_drag_button_right.xml
@@ -23,7 +23,7 @@
   -->
 
 <org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													xmlns:c="http://schemas.android.com/apk/res-auto"
 													a:id="@id/cpp_button_right"
 													c:textUp="▷▷"
 													a:text="▷"
diff --git a/android-app/src/main/res/layout/cpp_drag_button_round_brackets.xml b/android-app/src/main/res/layout/cpp_drag_button_round_brackets.xml
index 580a2631..14b3278a 100644
--- a/android-app/src/main/res/layout/cpp_drag_button_round_brackets.xml
+++ b/android-app/src/main/res/layout/cpp_drag_button_round_brackets.xml
@@ -23,7 +23,7 @@
   -->
 
 <org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													xmlns:c="http://schemas.android.com/apk/res-auto"
 													a:id="@id/cpp_button_round_brackets"
 													c:textUp="("
 													a:text="( )"
diff --git a/android-app/src/main/res/layout/cpp_drag_button_subtraction.xml b/android-app/src/main/res/layout/cpp_drag_button_subtraction.xml
index a4080a9c..4475b260 100644
--- a/android-app/src/main/res/layout/cpp_drag_button_subtraction.xml
+++ b/android-app/src/main/res/layout/cpp_drag_button_subtraction.xml
@@ -22,7 +22,7 @@
   ~ Site:  http://se.solovyev.org
   -->
 <org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													xmlns:c="http://schemas.android.com/apk/res-auto"
 													a:id="@id/cpp_button_subtraction"
 													c:textDown="∂,…"
 													a:text="-"
diff --git a/android-app/src/main/res/layout/cpp_drag_button_vars.xml b/android-app/src/main/res/layout/cpp_drag_button_vars.xml
index 99f495f6..5d11379f 100644
--- a/android-app/src/main/res/layout/cpp_drag_button_vars.xml
+++ b/android-app/src/main/res/layout/cpp_drag_button_vars.xml
@@ -23,7 +23,7 @@
   -->
 
 <org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													xmlns:c="http://schemas.android.com/apk/res-auto"
 													a:id="@id/cpp_button_vars"
 													c:directionTextScale="0.5"
 													c:textUp="+π"
diff --git a/android-app/src/main/res/layout/cpp_wizard_step_drag_button.xml b/android-app/src/main/res/layout/cpp_wizard_step_drag_button.xml
index b049312e..cadb6865 100644
--- a/android-app/src/main/res/layout/cpp_wizard_step_drag_button.xml
+++ b/android-app/src/main/res/layout/cpp_wizard_step_drag_button.xml
@@ -23,7 +23,7 @@
   -->
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+			  xmlns:c="http://schemas.android.com/apk/res-auto"
 			  a:layout_width="match_parent"
 			  a:layout_height="match_parent"
 			  a:orientation="vertical">
diff --git a/android-app/src/main/res/layout/drag_button_calibration.xml b/android-app/src/main/res/layout/drag_button_calibration.xml
index 97613ab0..92f396ad 100644
--- a/android-app/src/main/res/layout/drag_button_calibration.xml
+++ b/android-app/src/main/res/layout/drag_button_calibration.xml
@@ -23,7 +23,7 @@
   -->
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+			  xmlns:c="http://schemas.android.com/apk/res-auto"
 			  a:orientation="vertical"
 			  a:layout_width="fill_parent"
 			  a:layout_height="fill_parent"