Boeing named John Elbon vice president and general manager of Boeing Space Exploration in Houston, replacing former astronaut Brewster Shaw who retired from the company Aug. 26.

As Boeing Space Exploration’s vice president and general manager of commercial programs, Elbon has led the company’s efforts on the CST-100 space capsule it is developing with more than $100 million in NASA assistance. Shaw, 66, is a former space shuttle commander and Air Force pilot who has led all of Boeing’s civil space programs since 2006. Boeing announced his retirement in an Aug. 25 press release.

During Shaw’s tenure, Boeing helped NASA complete on-orbit assembly of the international space station and fly out the space shuttle program’s final 21 missions,

Boeing said Elbon’s replacement as the head of commercial programs will be appointed “in the coming weeks.”