Changed more strings to symbols