Fix more name strings
4 files changed