Ingest tool changes for tags and variable renaming