* Command & ahelp rename * Reviews * remove tpto (cherry picked from commit 44abe3e54d8522fe795a59a0b302a0f1f858cbbc)