diff --git a/etc/atbapp/states/APP_States.xml b/etc/atbapp/states/APP_States.xml
index 7e52beb..5ad7b76 100644
--- a/etc/atbapp/states/APP_States.xml
+++ b/etc/atbapp/states/APP_States.xml
@@ -14,13 +14,13 @@
     
     <APP_STATE name="LICENSEPLATE_INPUT">
         <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
-        <EVENT name="BUTTON_NEXT" resultingState="PARKTIME_SELECTION" setProduct="ShortTimeParking"/>
+        <EVENT name="BUTTON_NEXT" resultingState="PARKTIME_SELECTION" setProduct="SHORT_TERM_PARKING"/>
         <SCREEN name="LICENSEPLATE_INPUT"/>
     </APP_STATE>
    <APP_STATE name="PRODUCT_SELECTION">
        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
-       <EVENT name="BUTTON_VEHICLE_1" resultingState="PAYMENT_SELECTION_SHORT_TIME" setCashInputMode="PAY_UP"   setProduct="ShortTimeParking"/>
-       <EVENT name="BUTTON_VEHICLE_2" resultingState="PAYMENT_SELECTION_DAY" setCashInputMode="PAY_DOWN" setProduct="DayTicket"/>
+       <EVENT name="BUTTON_VEHICLE_1" resultingState="PAYMENT_SELECTION_SHORT_TIME" setCashInputMode="PAY_UP"   setProduct="SHORT_TERM_PARKING"/>
+       <EVENT name="BUTTON_VEHICLE_2" resultingState="PAYMENT_SELECTION_DAY" setCashInputMode="PAY_DOWN" setProduct="DAY_TICKET"/>
        <SCREEN name="PRODUCT_SELECTION"/>
    </APP_STATE>