minor renaming and namespacing