improve attribute naming