Fix typo "spaces" -> "underscores"

Was startled there for a few seconds.
Merge pull request #24 from glts/fix-canonical-name-typo

Fix typo "whitespace" -> "underscores"
Fix last 'matkaba' typo

This one bit me irl.
Merge pull request #25 from glts/fix-matkaba-typo

Fix last 'matkaba' typo