Small namespace changes