Adding in namespaces, renaming couple functions.