Make namespace slightly less confusing