Both of your points make sense. Totally forgot the class was called 'Care of Magical Creatures'.
I do love the umbrella used as an apostrophe in all the promo material. Hopefully glowing-tipped umbrellas make their way into the post-ride merch kiosk. lol
Speaking of subtlety, I'm curious how they'll theme the warning signage/wait time display at the entrance. Kong's is probably the least intrusive to the overall theming with it's weathered boards tied to 'bamboo' poles with skulls and such, which I really appreciated.