changed #defined names in espresso_core