Tweak naming to prevent conflicts.