As discussed upfront, I'd like to have these namespaced - I see they're already aliases... Guess that is enuff :)