Improve property namings (#145)