diff --git a/machine.capnp b/machine.capnp
index aa39c35..957b3f4 100644
--- a/machine.capnp
+++ b/machine.capnp
@@ -43,9 +43,9 @@ struct Machine {
 
     info @6 :Info;
     interface Info $CSharp.name("InfoInterface") {
-        getPropertyList @1 () -> ( propertyList :List(General.KeyValuePair) );
+        getPropertyList @0 () -> ( propertyList :List(General.KeyValuePair) );
 
-        getReservationList @2 () -> ( reservationList :List(Reservation) );
+        getReservationList @1 () -> ( reservationList :List(Reservation) );
     }
 
     use @7 :Use;
@@ -78,16 +78,16 @@ struct Machine {
     interface Manage $CSharp.name("ManageInterface") {
         getMachineInfoExtended @0 () -> ( machineInfoExtended :MachineInfoExtended, dummy :UInt8 = 0);
         
-        setProperty @0 (property :General.KeyValuePair);
-        removeProperty @1 (property :General.KeyValuePair);
+        setProperty @1 (property :General.KeyValuePair);
+        removeProperty @2 (property :General.KeyValuePair);
 
-        forceUse @2 ();
-        forceFree @3 ();
+        forceUse @3 ();
+        forceFree @4 ();
 
-        forceTransfer @4 (user :User);
+        forceTransfer @5 (user :User);
 
-        block @5 ();
-        disabled @6 ();
+        block @6 ();
+        disabled @7 ();
     }
 
     admin @12 :Admin;
diff --git a/user.capnp b/user.capnp
index 357e1c3..9ab4733 100644
--- a/user.capnp
+++ b/user.capnp
@@ -24,7 +24,7 @@ struct User
 
     info @3 :Info;
     interface Info $CSharp.name("InfoInterface") {
-        listRoles @1 () -> ( roles :List(Role) );
+        listRoles @0 () -> ( roles :List(Role) );
     }
 
     manage @4 :Manage;
@@ -36,10 +36,10 @@ struct User
     interface Admin $CSharp.name("AdminInterface") {
         getUserInfoExtended @0 () -> ( userInfoExtended :UserInfoExtended );
         
-        addRole @0 ( role :Role ) -> ();
-        removeRole @1 ( role :Role ) -> ();
+        addRole @1 ( role :Role ) -> ();
+        removeRole @2 ( role :Role ) -> ();
 
-        pwd @2 ( new_pwd :Text ) -> ();
+        pwd @3 ( new_pwd :Text ) -> ();
     }
 
     cardDESFireEV2 @6 :CardDESFireEV2;