You gotta have the concepts the machines are named after change as the nature of the machine changes (and bonus points if the nature of the concept is analogous to the nature of the machine). E.g. if my main machines were planets, then when I added servers they would be named after space hardware (hubble, webb, iss, etc). Raspberry Pis can be ceres, eros, vesta, juno, etc. It actually genuinely helps by distributing around within your brain the placement of which machine corresponds to which concept or which name, and also it frees up more names when you start having tons of machines in different categories.
I've had tons of naming schemes over the years (chemical elements and classic video games were two that I used for different banks of machines) and I've done that system with good results.