Modified custom ant build scripts to ensure no name collisions.