Rework call defines for ota package