Content Blocks plugin uses caption as field path name

In the content blocks tool, I added a new content block called 'articleBlocks' to a document. On checking the yaml, (as expected) I see that there is a new field called 'articleBlocks' with 'articleBlocks' as the caption.
I manually added this to the bean (since the bean tool cannot currently handle content blocks), repackage, restart etc and all is good.
In the document type editor, I change the caption of the new field to 'Article Blocks', save and commit. All is good.
The next time the content blocks tool is run (for any document type), the field name is changed to match the caption i,e. 'Article Blocks' and the bean can no longer find the original field 'articleBlocks'