fix for release(rename, remove debug outputs)
change macro names