Drop '2' suffix from CS2, SBS2

Now that CS1 and SBS1 have been deleted, the suffixes of "2" on
a lot of classes is unncessary and confusing. Drop the suffix.

Change-Id: Icb8c4797f59f259601f4e436bd2f04a13a904bbc
34 files changed