D/J-Scan Formats Changed

Updated the regexes to capture devscans/jgps.