diff --git a/cmd/main.go b/cmd/main.go
index 4c67a32..2daee8c 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -91,7 +91,7 @@ func main() {
 	rfs.AddLocalFunc("verify_pin", ussdHandlers.VerifyPin)
 	rfs.AddLocalFunc("check_identifier", ussdHandlers.CheckIdentifier)
 	rfs.AddLocalFunc("check_account_status", ussdHandlers.CheckAccountStatus)
-	rfs.AddLocalFunc("unlock_account", ussdHandlers.Authorize)
+	rfs.AddLocalFunc("authorize_account", ussdHandlers.Authorize)
 	rfs.AddLocalFunc("quit", ussdHandlers.Quit)
 	rfs.AddLocalFunc("check_balance", ussdHandlers.CheckBalance)
 	rfs.AddLocalFunc("validate_recipient", ussdHandlers.ValidateRecipient)
@@ -110,8 +110,8 @@ func main() {
 	rfs.AddLocalFunc("save_yob", ussdHandlers.SaveYob)
 	rfs.AddLocalFunc("save_offerings", ussdHandlers.SaveOfferings)
 	rfs.AddLocalFunc("quit_with_balance", ussdHandlers.QuitWithBalance)
-	rfs.AddLocalFunc("reset_unlocked", ussdHandlers.ResetAccountAuthorized)
-	rfs.AddLocalFunc("reset_unlock_for_update", ussdHandlers.ResetAllowUpdate)
+	rfs.AddLocalFunc("reset_account_authorized", ussdHandlers.ResetAccountAuthorized)
+	rfs.AddLocalFunc("reset_allow_update", ussdHandlers.ResetAllowUpdate)
 	rfs.AddLocalFunc("get_profile_info", ussdHandlers.GetProfileInfo)
 	rfs.AddLocalFunc("verify_yob", ussdHandlers.VerifyYob)
 	rfs.AddLocalFunc("reset_incorrect_date_format", ussdHandlers.ResetIncorrectYob)
diff --git a/services/registration/edit_profile.vis b/services/registration/edit_profile.vis
index d85bbc4..566b827 100644
--- a/services/registration/edit_profile.vis
+++ b/services/registration/edit_profile.vis
@@ -1,6 +1,6 @@
-LOAD reset_unlocked 16
-LOAD reset_unlock_for_update 0
-RELOAD reset_unlock_for_update
+LOAD reset_account_authorized 16
+LOAD reset_allow_update 0
+RELOAD reset_allow_update
 MOUT edit_name 1
 MOUT edit_gender 2
 MOUT edit_yob 3
diff --git a/services/registration/my_account.vis b/services/registration/my_account.vis
index 20eb6d5..345b1a0 100644
--- a/services/registration/my_account.vis
+++ b/services/registration/my_account.vis
@@ -1,4 +1,4 @@
-LOAD reset_unlock_for_update 0
+LOAD reset_allow_update 0
 MOUT profile 1
 MOUT change_language 2
 MOUT check_balance 3
diff --git a/services/registration/pin_entry.vis b/services/registration/pin_entry.vis
index cb99035..2eaf40f 100644
--- a/services/registration/pin_entry.vis
+++ b/services/registration/pin_entry.vis
@@ -1,4 +1,4 @@
-LOAD unlock_account 0
+LOAD authorize_account 0
 HALT
-RELOAD unlock_account
+RELOAD authorize_account
 MOVE _
diff --git a/services/registration/transaction_pin.vis b/services/registration/transaction_pin.vis
index 5c10b3f..5113b6c 100644
--- a/services/registration/transaction_pin.vis
+++ b/services/registration/transaction_pin.vis
@@ -6,9 +6,10 @@ MAP get_sender
 MOUT back 0
 MOUT quit 9
 HALT
-LOAD unlock_account 1
-RELOAD unlock_account
+LOAD authorize_account 1
+RELOAD authorize_account
 CATCH incorrect_pin 15 1
 INCMP _ 0
 INCMP quit 9
 MOVE transaction_initiated
+