change accessors to make them all consistent