make commands of thor tasks simplify
change name of internal functions and find rule of TBB