make the notations more consistent. backup before major structure change