Printed Pi camera 2 lens removal tool naming

The Pi camera usually comes with a tool for removing the lens - which we call a 'Pi camera lens tool' in the instructions and BOM. The tool page extends the description as 'Raspberry Pi Camera Lens Removal Tool'.
Sometimes the tool is not supplied. The BOM says 'you can 3D print a workaround lens remover'. In the tool page it says 'there is a workaround using a printed tool.' (bold where the link is) The linked workaround page is titled workaround_lens_remover.html with the in-page title 'Workaround: removing the Pi camera lens without the official tool'. This page also has some inconsistencies in language and mentions Pi Camera v1, which is not supported anyway.
The actual printed part is called 'picamera_2_lens_gripper.stl'

The links to the workaround are only in the BOM sections of the pages, which I think will mean a number of people miss them and go straight to the all-stls.zip to find the part.

This can cause confusion (https://openflexure.discourse.group/t/is-the-included-lens-tool-correct/1405).

I think that the part name that we use for the tool that is usually provided is descriptively helpful. The workaround could use more of the same language. In the printed part stl name the designation 'gripper' rather than 'tool' makes it hard to find.