Merge "Clean up some terminology related to interactive state." into klp-modular-dev