Change various leftover strings

Some strings left over from the fork no longer match the context of the tool so they need to be updated.

Includes contributions merged in from the following PRs: #2, #3, #4 and #5