* Fixes #36 by using the renamemap * Also fix harness passes annotation handling h/t azidar * Remove old comment