Rename the structure: PrivateContext.

PrivateContext ->
CommandActionContext

Previously all the members in PrivateContext are concerned only with
the command action. So the structure should not be PrivateContext
that is for the general context for the class.