Note that this applies to the CSM; the LM was also a NASA design but may have been somewhat more influenced by the contractor.

See Tom Kelly's "Moon Lander", just published. Kelly claims the LM was a Grumman design.