Clean up namespace, names a bit