variable name cleanup
bug fix: trigger rearm message would wake people with smartrecovery set