Make namespace less verbose, fix uints