Stop using Helm everywhere

Without fuzzy matching the whole thing is tedious.