Rename states and the more consistently in scripts
TODOs and issues