THRIFT-2628 (with generator option to preserve old naming scheme)