Closes #36. Replace code words in bug summary.