We need generic code, so we should remove/rename/replace (depending on their usage) all SIMARA mentions: