namespace fixes

vanity