[wip] Fix rebase issue:

  * Correct variable names to prevent confusion.
  * Disable require of CppSpec.