Revert "Minor changes on comments and descriptions"

This reverts commit fc0fa9072c29b3962c2af238b3a36575b8b4810e.
calculate.CBparam to calculate.CDparam
Revert "calculate.CBparam to calculate.CDparam"

This reverts commit a6d693fbf962c92818b014d8ff03e10fdbb50a04.