Update template generator in sync with removal of Client namespace.