Modified name and scope names again