do the h$ renaming and support latest codegen changes