WYCS: minor renaming