BUG-7568: account for module/submodule split