Fixed name clash errors for Closure compiler

Here are the changes to make the Closure compiler at least not stopping with a fatal error.