Fixed intramodule references