Fixed some namespace inconsistencies