Minor namespace changes