Mine, too. I'm currently hung up on "Shuttlebay". The "Hangar", was only called two things during TOS: most commonly it was the "Hangar Deck", and only once did Kirk refer to the "Flight Deck":People importing TNG era terminology into the TOS era has become a major pet peeve of mine.
KIRK: This is the observation deck. That's the flight deck down there with the shuttle craft.
Perhaps the Flight Deck was just the landing/takeoff zone (includes rotating pad where the shuttle craft was parked) on the larger Hangar Deck. I'm just a little perplexed what to call the shuttle storage area under the Hangar Deck; perhaps the "Shuttle Storage Deck" (never seen/referred on TOS, but definitely seen in TMP).