Modify files to correspond to updated module name. Fix minor bugs