some minor renaming