Better name for macro
Bug fix
Regenerated build/