Renamed Tools and Implemented Disposal