Duplicates and inconsistent listings are always a pain, especially with Buchla clones and obscure modules like CBS or San Francisco Tape Center gear. For those, maybe grouping them under “Buchla” but noting the manufacturer/clone in parentheses could work - keeps them searchable without losing the historical context. Overall, a consistent scheme like yours will make the database way more user-friendly.