Reverted back to `ACTIVITY_` keys