Fix some of the namespacing and interface stuff