You should hire lawyers to improve your contracts before the ambiguity in your old ones cause lawsuits.

That said, “Blue Oak” is a terrible name and will cause even more hassle than “Apache” when dealing with non-technical folks.

Explaining to the CFO that we license <component> to customers under “Apache” terms to avoid internal legal issues for our customers is... hard.