Renaming to distinguish the heuristic aligner

Now the heuristic aligner is its own object, so work on a model based
aligner can proceed in parallel without conflicts.