Rename messages to deliveries