Clean up *internal* var and function names