Renamed CREATE_VAPI to GENERATE_VAPI