remove unnecessary class suffixes

Since the app already has properties for class types, the suffixes were
a bit too much.