Deals better with multiple PIDs under the same name now