@StarFleet CarlI mostly agree with your definitions.
Many, if not most "Preppers" are preparing themselves and their loved ones to survive 96 hours to maybe 14 days without access to stores, government, etc. Some, even many have firearms to protect themselves from criminals. They are not preparing for years of life without civilization.
Many Preppers believe in having not just a "Go-Bag" in their vehicle, but common sense things such as a first aid kit, tool kit, jumper cables, a couple of quarts/gallons of water, chains, a jacket, gloves, hat, walking shoes or boots, etc. Items useful in a sudden snowstorm, or similar circumstance.
Also the EDC: Every Day Carry: Wallet w/cash, ID, etc., a folding knife, a multi-tool, mini-flashlight, an possibly an IFAK (Individual First Aid Kit) and possibly a pistol. (Some people carry quite a bit more, such as a water-filter straw, 10m cord, lighter/fire starter, etc.
The essential bit of EDC is you have it on your person every time you leave your home!
I think of it as similar to the "Ten Essentials" that you have on a casual day hike, a week in the Cascade Mts., or an Expedition to Mt. Everest.
I would also add a category:
Off Grid: folks who are prepared to live without public utilities (Electricity/Water/Sewer/Garbage disposal), and to grow their own food. Many are seeking a "less polluting" lifestyle, or a "locovores" some of them believe that AGW/"Climate Change" or other calamities, but not really a collapse of civilization. Many of these people are of a "Center-Left" political perspective, and don't have firearms (or at least not a primary form of defense from humans).