Improve booking system

We are a transportation company. We transport luggage (bikes, etc). I'm looking for a designer. we have a booking system but it is very confused for our clients. The booking has 5 steps: - Step 1: Travel type (One way or round trip) + luggage information - Step 2: Client's information (First name, last name, phone number, email). - Step 3: Departure address (This is the address where the trip of the client starts and our driver will pick up the luggage: Departure date, Return date, street, house number, city, country, etc). - Step 4: Delivery address (street, house number, city, country, etc). - Step5: Check your information (Overview) and payment. If the payment is approved, we send an email with the information about the booking, pick up dates, etc. If the travel type is round trip, the client may select another address where our driver will pick up their luggage. It is now an issue with the flow because the client cannot understand what is the address that he/she needs to put on the just form. Sometimes we receive bookings with the addresses reversed. So we want an UI friendly, easy to use for our clients. We can schedule a call to explain more about it. Let me know!