I mainly wanted things to be consistent across the systems to avoid the same manufacturer being named in 3 different ways (as it was previously, in some cases).
if there is consensus on this, I will batch replace the complete manufacturer names with shorter versions later
