Reword step definitions to match steps appropriately