Fix attribute naming