Rename singleton to single_symbol