Revise task names, add dotPsci task