Herb generation - refactoring (renames).