I've added a bunch of aliases in the other branch just now(caught by builder API). I'll actually audit everything I moved/renamed to make sure we've an alias