fixing some namespace issues with the previous commit