Merge change Iecf85b40 into eclair-mr2

* changes:
  Rename several files so that readers would not be confused.