Also renamed the source/header files, now they are more closely aligned to how we rename most other source files svn-id: r54264