Fixing errors

Fixing to errors caused by overlooked changes in strings names.