Improved model attribute names