* started to cleanup name clashes for onetime compilation