Fixing authentication failure handling logic in CLI
Renaming endpoint constant names in CLI