renamed attributes to sync up with db