Adapted sorting to the new shortened class names

Change-Id: I8d49ce236123d0c787e9d6b9d0c32ef5da21bf8b