caf: Give context structure a consistent name