fix some re-naming