Remove duplication in some actors. Fix naming conventions for those files. Use the correct material. Noticed by: @marder This was SVN commit r26511.