fixup attribute naming