Merge change 3203 into donut

* changes:
  rename a few files to camel-case, add copyright notices