Clean up namespace and some variable names