Keren proposes renaming domino2 to domino (and domino to domino_old or something similar that doesn't break various scripts). In general, changing external source code to use then renamed module would just be a matter of running sed (I'll provide the sed command details if we move it). Any opposition?