Address naming concerns