diff --git a/res/layout-port/main_calculator.xml b/res/layout-port/main_calculator.xml
index f3163564..aa51b1d6 100644
--- a/res/layout-port/main_calculator.xml
+++ b/res/layout-port/main_calculator.xml
@@ -40,7 +40,7 @@
 			<include layout="@layout/calc_eight_digit_button"/>
 			<include layout="@layout/calc_nine_digit_button"/>
 			<include layout="@layout/calc_multiplication_button"/>
-			<include layout="@layout/calc_erase_button"/>
+			<include layout="@layout/calc_clear_button"/>
 
 		</LinearLayout>
 
@@ -50,7 +50,7 @@
 			<include layout="@layout/calc_five_digit_button"/>
 			<include layout="@layout/calc_six_digit_button"/>
 			<include layout="@layout/calc_division_button"/>
-			<include layout="@layout/calc_clear_button"/>
+			<include layout="@layout/calc_erase_button"/>
 
 		</LinearLayout>
 
diff --git a/res/layout-port/main_cellphone.xml b/res/layout-port/main_cellphone.xml
index ce391ffd..2f2fd2c4 100644
--- a/res/layout-port/main_cellphone.xml
+++ b/res/layout-port/main_cellphone.xml
@@ -34,7 +34,7 @@
 			<include layout="@layout/calc_two_digit_button"/>
 			<include layout="@layout/calc_three_digit_button"/>
 			<include layout="@layout/calc_multiplication_button"/>
-			<include layout="@layout/calc_erase_button"/>
+			<include layout="@layout/calc_clear_button"/>
 
 		</LinearLayout>
 
@@ -44,7 +44,7 @@
 			<include layout="@layout/calc_five_digit_button"/>
 			<include layout="@layout/calc_six_digit_button"/>
 			<include layout="@layout/calc_division_button"/>
-			<include layout="@layout/calc_clear_button"/>
+			<include layout="@layout/calc_erase_button"/>
 
 		</LinearLayout>
 
diff --git a/src/test/java/org/solovyev/android/calculator/model/CalculatorEngineTest.java b/src/test/java/org/solovyev/android/calculator/model/CalculatorEngineTest.java
index 5ffe47c2..bb294452 100644
--- a/src/test/java/org/solovyev/android/calculator/model/CalculatorEngineTest.java
+++ b/src/test/java/org/solovyev/android/calculator/model/CalculatorEngineTest.java
@@ -366,7 +366,7 @@ public class CalculatorEngineTest {
 			try {
 				cm.evaluate(JsclOperation.numeric, "10/11");
 				fail();
-			} catch (CalculatorParseException e) {
+			} catch (CalculatorEvalException e) {
 				// ok
 			}
 		} finally {