Added a crude way to eliminate name collisions