More consistent name for release macro.
Fixed some state setup.