Actually, I recommend we get rid of my change to make it consistent with the other models and revert the model and all its uses to `module_state_key` but I'm worn down with tweaks.