Corrected some namespacing issues