Fix some string names