Removed "AVM" from the module name.