Packages renames, clothing and tool bug fix