diff --git a/protob/messages.proto b/protob/messages.proto
index c893bd03e..d3ff6dd95 100644
--- a/protob/messages.proto
+++ b/protob/messages.proto
@@ -126,6 +126,8 @@ message Failure {
 // Computer should respond with ButtonAck message or Cancel to cancel
 // the original request.
 message ButtonRequest {
+	optional string code = 1;
+	optional string data = 2;
 }
 
 // Computer agrees to wait for HW button press.
diff --git a/protob/types.proto b/protob/types.proto
index 045e761f5..8afb4b4c7 100644
--- a/protob/types.proto
+++ b/protob/types.proto
@@ -8,7 +8,7 @@
 
 // Some sugar for easier handling in Multibit
 option java_package = "org.multibit.hd.hardware.trezor.protobuf";
-option java_outer_classname = "TrezorTypes";
+option java_outer_classname = "TrezorType";
 
 import "google/protobuf/descriptor.proto";