Address naming issues to avoid confusion