Merge "Update nicknames in swagger spec"