more namespace changes