fixing some namespace notation issues