Applied ShortenedNames more