Fixed namespacing issues across multiple files