addressed renames in thx.geom