Maintenance: rename a few structs and files for consistency with the rest of the codebase#7001

gauravIoTEdge wants to merge 2 commits intoAzure:mainAzure/iotedge:mainfrom

gauravIoTEdge:mild-refactorgauravIoTEdge/iotedge:mild-refactorCopy head branch name to clipboard