The types=>type change looks good, but I think the module headings changes "conflict" with #6258.

@beaulebens They do, but we can figure it out.

The file module-headings.php is created during build so those changes in module-headings.php must be actually done in each module file header as shown here https://github.com/Automattic/jetpack/pull/6258/files#diff-fd02f3fe4ff6aae933fe9ad980a48557

Question @beaulebens should the periods at the end of these descriptions be removed? because some are used as labels for toggles.

Update: never mind, I saw Michael's PR https://github.com/Automattic/jetpack/pull/6259/files

About the module-headings.php, I realized now that what you meant was that it changed without your intervention. That happens during a build. To avoid this I usually run gulp or gulp watch directly. Only when I know there's something to build (like due to an update in dops components) I run yarn build.

I've now restored the file and removed the periods at the end of the sentences.

@eliorivero since it's generated, should we remove it from version control?

Yes, we should do it.

Btw this now is good to go 🐑