fixing syntax inconsistency and adding new envvar
fixing refactored module name