- fixed Avatar class missing user id field

- renamed AvatarType to Type