agreed. keeping the alias just means we don't have to change all the clients immediately, so I can merge this asap.