typo in directory name and missing namespace
Merge branch 'hotfix/functional_generator' into next