get rid of somewhat arbitraty _ naming convention for modules