Fix incorrectly named address attributes