Tools rename and minor fixes