minor renaming efforts