Change string keys to prepare for internationalization, see issue #36