Update for Ohana attribute names