Updated generator to use _ instead of - in formula names. Renamed
        package_map to map.