Our modularisation effort came only after we've started writing 7.0 GSG. Since I worked in command line, I never cared for filenames, but it seems the team has decided on different naming convention.

Current naming convention in GSG: type_of_the_doc_name_of_chapter; e.g. concept_deploy.
Desired convention: name_of_chapter__type_of_the_doc.

Please confirm with Stetson or Emily the correct convention. Once you do, rename the filenames in upstream getting started guide, both 7.0 and master.