Rename vapi to be consistent with the rest