rename files for consistency
Merge branch 'file-rename'.  Rename files for consistency.