Restore codename support, and make it configurable.