type fixes in module names