#833 - Fix hardcoded strings