adding support for the thematic module naming scheme