Rename model classes, upgrade goods. Bar into large list.