FWIW, "Module" should be on its way out, since migrating to XBlocks is one of our major goals.