some namespace changes