Issue/improve v2 support

Created by: edvgui

Description

Support for module v2 generation was not complete, it didn't work for modules with "composed" names (e.g. test_module). This PR fixes this.

Self Check:

Strike through any lines that are not applicable (~~line~~) then check the box

• Attached issue to pull request
• Changelog entry
• Type annotations are present
• Code is clear and sufficiently documented
• No (preventable) type errors (check using make mypy or make mypy-diff)
• Sufficient test cases (reproduces the bug/tests the requested feature)
• Correct, in line with design
• End user documentation is included or an issue is created for end-user documentation (add ref to issue here: )

Reviewer Checklist:

• Sufficient test cases (reproduces the bug/tests the requested feature)
• Code is clear and sufficiently documented
• Correct, in line with design