Try to get module name conventions right

Before going further with the refactoring, at least get module names for newly introduced model modules correct.

Signed-off-by: Stefan Marr <git@stefan-marr.de>