fixed Module.t

and more renaming