@djtecha Thanks for your patience on this one. Some renaming of the directories to allow more flexbility is planned here: https://github.com/elastic/beats/pull/5328
For the issue with the keyword, perhapse @monica knows more? Could you also open a Github issue with it?