LPS-41008 Improve consistency. Rename variables and action URLs