fixes #6007 and future bugs with gear names