Issue 21: Consistently use "Fill-up" instead of "Fuel-up"