Corrected tools section

Added some todo's where different terminology was used and one at the
end, where a more descriptive solution is proposed.