Hey ElfTengu,
Actually, Goshinjutsu is exactly the term I use (keeps the Japanese "flavour"). Each class is broken into three main sections, Traditional (Taijutsu, taken from the Densho. Since July I've been presenting each of the Ryu completely and without omission, and without influence from the other ones, starting with Gyokko Ryu, for 6 months at a time. Koto Ryu is next, then Togakure Ryu, then Kukishinden Ryu...), Buki (Weaponry, with Sword every three months, Hanbo every three months, and the other months filled in with Instructor's Choice. These can be Traditional [such as Kusari Fundo, Jo, Bo, Kodachi, Kunai etc], or more Modern [knife, baton, pistol defence etc]), and Goshinjutsu (Modern Self Defence - gross motor response, pressure tested and trained with adrenaline, with major topics including knife defence, groups, pre-emptive striking, verbal defusion, ground escape and defence, and topics we refer to as Fight Science, as well as many others). There is also, obviously, warm up and stretching, meditations, Sensory Training, and many other topics that get explored on occasion. Each class then ends with a Question/Answer and Feedback period.
In terms of how long is spent on each, honestly not enough! It's an hour and a half class, so typically between 20 and 30 minutes, depending on how the class is running. We then also have Special Workshops, in which we can take a deeper look at a topic, which realistically is the "other half" of the training.
Oh, and completely agreed on the spanner analogy, by the way.