Use more unique namespacing, add sourcemap