Merge "Shortening swagger spec nicknames"