revert feature renames