In order to provide further clarity between the two
Pipe -> Smoking_Pipe & Pipe -> Pipe_(Plumbing)
In addition, the existing drainpipe & lead_pipe -> Pipe_(Plumbing)
Also Kiseru could possibly receive the Smoking Pipe implication as so many images have already been tagged with it.
Updated