#11: minor renaming