Did they have The Borg Invasion yet when you went? They added just a few years after we went, and I've always been disappointed that we missed it. We did go through the Klingon Encounter, which was a fun.
I have to laugh because we have shows like that where they seem to go out of their way Supernatural or Sandan where Lucifer is a major character, or the biggest one would be Lucifer the show, where he's the title character and is presented as a good guy.This talk of Marvel's "Not Satans" reminds me that I'm pretty sure that terrible Helstrom Hulu show never referred to the title character as the "Son of Satan", at least they didn't in any trailers or marketing that I remember. They called the show "Helstrom", even though the characters name is Daimon Hellstrom, and made the main characters children of a serial killer instead of a demon. I seriously wonder why that ever got made, even with the weird stuff Marvel TV used to do.
Honestly, Studios being worried about Christians being offended is weird nowadays, because the ones that will boycott things are already whining about everything anyway (I still remember people declaring Pokemon to be demonic). Those kinds of things never end up effecting a movie/TV shows success, anyway.