libhb: Make new presets names less verbose.

Only the names have been changed, to protect the innocent.

3 files changed, 114 insertions, 114 deletions

diff --git a/libhb/builtin_presets.h b/libhb/builtin_presets.h
index 1597143a9..90db49259 100644
--- a/libhb/builtin_presets.h
+++ b/libhb/builtin_presets.h
@@ -66,7 +66,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 1920, \n"
 "                    \"PresetDescription\": \"H.264 video (up to 1080p30) and AAC stereo audio, in an MP4 container.\", \n"
-"                    \"PresetName\": \"Fast 1080p Full HD\", \n"
+"                    \"PresetName\": \"Fast 1080p30\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -162,7 +162,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 1280, \n"
 "                    \"PresetDescription\": \"H.264 video (up to 720p30) and AAC stereo audio, in an MP4 container.\", \n"
-"                    \"PresetName\": \"Fast 720p HD\", \n"
+"                    \"PresetName\": \"Fast 720p30\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -258,7 +258,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 720, \n"
 "                    \"PresetDescription\": \"H.264 video (up to 576p25) and AAC stereo audio, in an MP4 container.\", \n"
-"                    \"PresetName\": \"Fast 576p PAL SD\", \n"
+"                    \"PresetName\": \"Fast 576p25\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -354,7 +354,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 720, \n"
 "                    \"PresetDescription\": \"H.264 video (up to 480p30) and AAC stereo audio, in an MP4 container.\", \n"
-"                    \"PresetName\": \"Fast 480p SD\", \n"
+"                    \"PresetName\": \"Fast 480p30\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -464,7 +464,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 1920, \n"
 "                    \"PresetDescription\": \"High quality H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container.\", \n"
-"                    \"PresetName\": \"HQ 1080p Full HD Surround\", \n"
+"                    \"PresetName\": \"HQ 1080p30 Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -574,7 +574,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 1280, \n"
 "                    \"PresetDescription\": \"High quality H.264 video (up to 720p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container.\", \n"
-"                    \"PresetName\": \"HQ 720p HD Surround\", \n"
+"                    \"PresetName\": \"HQ 720p30 Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -684,7 +684,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 720, \n"
 "                    \"PresetDescription\": \"High quality H.264 video (up to 576p25), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container.\", \n"
-"                    \"PresetName\": \"HQ 576p PAL SD Surround\", \n"
+"                    \"PresetName\": \"HQ 576p25 Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -794,7 +794,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 720, \n"
 "                    \"PresetDescription\": \"High quality H.264 video (up to 480p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container.\", \n"
-"                    \"PresetName\": \"HQ 480p SD Surround\", \n"
+"                    \"PresetName\": \"HQ 480p30 Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -904,7 +904,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 1920, \n"
 "                    \"PresetDescription\": \"Super high quality H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container.\", \n"
-"                    \"PresetName\": \"Super HQ 1080p Full HD Surround\", \n"
+"                    \"PresetName\": \"Super HQ 1080p30 Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -1014,7 +1014,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 1280, \n"
 "                    \"PresetDescription\": \"Super high quality H.264 video (up to 720p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container.\", \n"
-"                    \"PresetName\": \"Super HQ 720p HD Surround\", \n"
+"                    \"PresetName\": \"Super HQ 720p30 Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -1124,7 +1124,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 720, \n"
 "                    \"PresetDescription\": \"Super high quality H.264 video (up to 576p25), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container.\", \n"
-"                    \"PresetName\": \"Super HQ 576p PAL SD Surround\", \n"
+"                    \"PresetName\": \"Super HQ 576p25 Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -1234,7 +1234,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 720, \n"
 "                    \"PresetDescription\": \"Super high quality H.264 video (up to 480p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container.\", \n"
-"                    \"PresetName\": \"Super HQ 480p SD Surround\", \n"
+"                    \"PresetName\": \"Super HQ 480p30 Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -1337,7 +1337,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 1920, \n"
 "                    \"PresetDescription\": \"H.264 video (up to 1080p30) and AAC stereo audio, in an MP4 container. Compatible with Android devices.\", \n"
-"                    \"PresetName\": \"Android 1080p Full HD\", \n"
+"                    \"PresetName\": \"Android 1080p30\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -1433,7 +1433,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 1280, \n"
 "                    \"PresetDescription\": \"H.264 video (up to 720p30) and AAC stereo audio, in an MP4 container. Compatible with Android devices.\", \n"
-"                    \"PresetName\": \"Android 720p HD\", \n"
+"                    \"PresetName\": \"Android 720p30\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -1529,7 +1529,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 720, \n"
 "                    \"PresetDescription\": \"H.264 video (up to 576p25) and AAC stereo audio, in an MP4 container. Compatible with Android devices.\", \n"
-"                    \"PresetName\": \"Android 576p PAL SD\", \n"
+"                    \"PresetName\": \"Android 576p25\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -1625,7 +1625,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 720, \n"
 "                    \"PresetDescription\": \"H.264 video (up to 480p30) and AAC stereo audio, in an MP4 container. Compatible with Android devices.\", \n"
-"                    \"PresetName\": \"Android 480p SD\", \n"
+"                    \"PresetName\": \"Android 480p30\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -1735,7 +1735,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 1920, \n"
 "                    \"PresetDescription\": \"H.264 video (up to 1080p60), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPad Pro; iPad Air; iPad mini 2nd, 3rd Generation and later; Apple TV 4th Generation and later.\", \n"
-"                    \"PresetName\": \"Apple 1080p60 Full HD Surround\", \n"
+"                    \"PresetName\": \"Apple 1080p60 Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -1845,7 +1845,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 1920, \n"
 "                    \"PresetDescription\": \"H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 5, 5S, 6, 6s, and later; iPod touch 6th Generation and later; iPad Pro; iPad Air; iPad 3rd, 4th Generation and later; iPad mini; Apple TV 3rd Generation and later.\", \n"
-"                    \"PresetName\": \"Apple 1080p Full HD Surround\", \n"
+"                    \"PresetName\": \"Apple 1080p30 Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -1955,7 +1955,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 1280, \n"
 "                    \"PresetDescription\": \"H.264 video (up to 720p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 4 and later; iPod touch 4th, 5th Generation and later; Apple TV 2nd Generation and later.\", \n"
-"                    \"PresetName\": \"Apple 720p HD Surround\", \n"
+"                    \"PresetName\": \"Apple 720p30 Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -2065,7 +2065,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 960, \n"
 "                    \"PresetDescription\": \"H.264 video (up to 540p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 1st Generation, 3G, 3GS, and later; iPod touch 1st, 2nd, 3rd Generation and later; iPod Classic; Apple TV 1st Generation and later.\", \n"
-"                    \"PresetName\": \"Apple 540p qHD Surround\", \n"
+"                    \"PresetName\": \"Apple 540p30 Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -2161,7 +2161,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 320, \n"
 "                    \"PresetDescription\": \"H.264 video (up to 240p30) and AAC stereo audio, in an MP4 container. Compatible with Apple iPod 5th Generation and later.\", \n"
-"                    \"PresetName\": \"Apple 240p QVGA\", \n"
+"                    \"PresetName\": \"Apple 240p30\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -2271,7 +2271,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 1920, \n"
 "                    \"PresetDescription\": \"H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Google Chromecast.\", \n"
-"                    \"PresetName\": \"Chromecast 1080p Full HD Surround\", \n"
+"                    \"PresetName\": \"Chromecast 1080p30 Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -2381,7 +2381,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 1920, \n"
 "                    \"PresetDescription\": \"H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) audio, in an MP4 container. Compatible with Amazon Fire TV.\", \n"
-"                    \"PresetName\": \"Fire TV 1080p Full HD Surround\", \n"
+"                    \"PresetName\": \"Fire TV 1080p30 Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -2491,7 +2491,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 1920, \n"
 "                    \"PresetDescription\": \"H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Playstation 3 and 4.\", \n"
-"                    \"PresetName\": \"Playstation 1080p Full HD Surround\", \n"
+"                    \"PresetName\": \"Playstation 1080p30 Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -2587,7 +2587,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 1280, \n"
 "                    \"PresetDescription\": \"H.264 video (up to 720p30) and AAC stereo audio, in an MP4 container. Compatible with Playstation Vita TV.\", \n"
-"                    \"PresetName\": \"Playstation Vita TV 720p HD\", \n"
+"                    \"PresetName\": \"Playstation Vita TV 720p30\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -2683,7 +2683,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 960, \n"
 "                    \"PresetDescription\": \"H.264 video (up to 540p30) and AAC stereo audio, in an MP4 container. Compatible with Playstation Vita.\", \n"
-"                    \"PresetName\": \"Playstation Vita 540p qHD\", \n"
+"                    \"PresetName\": \"Playstation Vita 540p30\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -2796,7 +2796,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 3840, \n"
 "                    \"PresetDescription\": \"H.265 video (up to 2160p60), AAC stereo audio, and surround audio, in an MKV container. Compatible with Roku 4.\", \n"
-"                    \"PresetName\": \"Roku 2160p60 4K UHD-1 Surround\", \n"
+"                    \"PresetName\": \"Roku 2160p60 4K Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -2909,7 +2909,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 3840, \n"
 "                    \"PresetDescription\": \"H.265 video (up to 2160p30), AAC stereo audio, and surround audio, in an MKV container. Compatible with Roku 4.\", \n"
-"                    \"PresetName\": \"Roku 2160p 4K UHD-1 Surround\", \n"
+"                    \"PresetName\": \"Roku 2160p30 4K Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -3018,8 +3018,8 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureRotate\": \"angle=0:hflip=0\", \n"
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 1920, \n"
-"                    \"PresetDescription\": \"H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Roku 1080p Full HD models.\", \n"
-"                    \"PresetName\": \"Roku 1080p Full HD Surround\", \n"
+"                    \"PresetDescription\": \"H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Roku 1080p models.\", \n"
+"                    \"PresetName\": \"Roku 1080p30 Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -3128,8 +3128,8 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureRotate\": \"angle=0:hflip=0\", \n"
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 1280, \n"
-"                    \"PresetDescription\": \"H.264 video (up to 720p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Roku 720p HD models.\", \n"
-"                    \"PresetName\": \"Roku 720p HD Surround\", \n"
+"                    \"PresetDescription\": \"H.264 video (up to 720p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Roku 720p models.\", \n"
+"                    \"PresetName\": \"Roku 720p30 Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -3225,7 +3225,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 720, \n"
 "                    \"PresetDescription\": \"H.264 video (up to 576p25) and AAC stereo audio, in an MP4 container. Compatible with Roku standard definition models.\", \n"
-"                    \"PresetName\": \"Roku 576p PAL SD\", \n"
+"                    \"PresetName\": \"Roku 576p25\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -3321,7 +3321,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 720, \n"
 "                    \"PresetDescription\": \"H.264 video (up to 480p30) and AAC stereo audio, in an MP4 container. Compatible with Roku standard definition models.\", \n"
-"                    \"PresetName\": \"Roku 480p SD\", \n"
+"                    \"PresetName\": \"Roku 480p30\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -3417,7 +3417,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 1920, \n"
 "                    \"PresetDescription\": \"H.264 video (up to 1080p30) and AAC stereo audio, in an MP4 container. Compatible with Windows Mobile devices with Qualcomm Snapdragon 800 (MSM8974), S4 (MSM8x30, MSM8960), and better CPUs.\", \n"
-"                    \"PresetName\": \"Windows Mobile 1080p Full HD\", \n"
+"                    \"PresetName\": \"Windows Mobile 1080p30\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -3513,7 +3513,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 1280, \n"
 "                    \"PresetDescription\": \"H.264 video (up to 720p30) and AAC stereo audio, in an MP4 container. Compatible with Windows Mobile devices with Qualcomm Snapdragon S4 (MSM8x27), S2 (MSM8x55), S1 (MSM8x50), and better CPUs.\", \n"
-"                    \"PresetName\": \"Windows Mobile 720p HD\", \n"
+"                    \"PresetName\": \"Windows Mobile 720p30\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -3609,7 +3609,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 960, \n"
 "                    \"PresetDescription\": \"H.264 video (up to 540p30) and AAC stereo audio, in an MP4 container. Compatible with Windows Mobile devices with Qualcomm Snapdragon 200 (MSM8210, MSM8212) and better CPUs.\", \n"
-"                    \"PresetName\": \"Windows Mobile 540p qHD\", \n"
+"                    \"PresetName\": \"Windows Mobile 540p30\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -3705,7 +3705,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 720, \n"
 "                    \"PresetDescription\": \"H.264 video (up to 480p30) and AAC stereo audio, in an MP4 container. Compatible with Windows Mobile devices with Qualcomm Snapdragon S1 (MSM7x27a) and better CPUs.\", \n"
-"                    \"PresetName\": \"Windows Mobile 480p SD\", \n"
+"                    \"PresetName\": \"Windows Mobile 480p30\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -3815,7 +3815,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 1920, \n"
 "                    \"PresetDescription\": \"H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Xbox One.\", \n"
-"                    \"PresetName\": \"Xbox 1080p Full HD Surround\", \n"
+"                    \"PresetName\": \"Xbox 1080p30 Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -3925,7 +3925,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 1920, \n"
 "                    \"PresetDescription\": \"H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Xbox 360.\", \n"
-"                    \"PresetName\": \"Xbox Legacy 1080p Full HD Surround\", \n"
+"                    \"PresetName\": \"Xbox Legacy 1080p30 Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -4028,7 +4028,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 1920, \n"
 "                    \"PresetDescription\": \"H.264 video (up to 1080p30) and AAC stereo audio, in an MKV container.\", \n"
-"                    \"PresetName\": \"H.264 MKV 1080p Full HD\", \n"
+"                    \"PresetName\": \"H.264 MKV 1080p30\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -4124,7 +4124,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 1280, \n"
 "                    \"PresetDescription\": \"H.264 video (up to 720p30) and AAC stereo audio, in an MKV container.\", \n"
-"                    \"PresetName\": \"H.264 MKV 720p HD\", \n"
+"                    \"PresetName\": \"H.264 MKV 720p30\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -4220,7 +4220,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 720, \n"
 "                    \"PresetDescription\": \"H.264 video (up to 576p25) and AAC stereo audio, in an MKV container.\", \n"
-"                    \"PresetName\": \"H.264 MKV 576p PAL SD\", \n"
+"                    \"PresetName\": \"H.264 MKV 576p25\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -4316,7 +4316,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 720, \n"
 "                    \"PresetDescription\": \"H.264 video (up to 480p30) and AAC stereo audio, in an MKV container.\", \n"
-"                    \"PresetName\": \"H.264 MKV 480p SD\", \n"
+"                    \"PresetName\": \"H.264 MKV 480p30\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -4412,7 +4412,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 1920, \n"
 "                    \"PresetDescription\": \"H.265 video (up to 1080p30) and AAC stereo audio, in an MKV container.\", \n"
-"                    \"PresetName\": \"H.265 MKV 1080p Full HD\", \n"
+"                    \"PresetName\": \"H.265 MKV 1080p30\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -4508,7 +4508,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 1280, \n"
 "                    \"PresetDescription\": \"H.265 video (up to 720p30) and AAC stereo audio, in an MKV container.\", \n"
-"                    \"PresetName\": \"H.265 MKV 720p HD\", \n"
+"                    \"PresetName\": \"H.265 MKV 720p30\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -4604,7 +4604,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 720, \n"
 "                    \"PresetDescription\": \"H.265 video (up to 576p25) and AAC stereo audio, in an MKV container.\", \n"
-"                    \"PresetName\": \"H.265 MKV 576p PAL SD\", \n"
+"                    \"PresetName\": \"H.265 MKV 576p25\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -4700,7 +4700,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 720, \n"
 "                    \"PresetDescription\": \"H.265 video (up to 480p30) and AAC stereo audio, in an MKV container.\", \n"
-"                    \"PresetName\": \"H.265 MKV 480p SD\", \n"
+"                    \"PresetName\": \"H.265 MKV 480p30\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -4794,7 +4794,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 1920, \n"
 "                    \"PresetDescription\": \"VP8 video (up to 1080p30) and Vorbis stereo audio, in an MKV container.\", \n"
-"                    \"PresetName\": \"VP8 MKV 1080p Full HD\", \n"
+"                    \"PresetName\": \"VP8 MKV 1080p30\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -4888,7 +4888,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 1280, \n"
 "                    \"PresetDescription\": \"VP8 video (up to 720p30) and Vorbis stereo audio, in an MKV container.\", \n"
-"                    \"PresetName\": \"VP8 MKV 720p HD\", \n"
+"                    \"PresetName\": \"VP8 MKV 720p30\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -4982,7 +4982,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 720, \n"
 "                    \"PresetDescription\": \"VP8 video (up to 576p25) and Vorbis stereo audio, in an MKV container.\", \n"
-"                    \"PresetName\": \"VP8 MKV 576p PAL SD\", \n"
+"                    \"PresetName\": \"VP8 MKV 576p25\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -5076,7 +5076,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 720, \n"
 "                    \"PresetDescription\": \"VP8 video (up to 480p30) and Vorbis stereo audio, in an MKV container.\", \n"
-"                    \"PresetName\": \"VP8 MKV 480p SD\", \n"
+"                    \"PresetName\": \"VP8 MKV 480p30\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -5170,7 +5170,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 1920, \n"
 "                    \"PresetDescription\": \"VP9 video (up to 1080p30) and Vorbis stereo audio, in an MKV container.\", \n"
-"                    \"PresetName\": \"VP9 MKV 1080p Full HD\", \n"
+"                    \"PresetName\": \"VP9 MKV 1080p30\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -5264,7 +5264,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 1280, \n"
 "                    \"PresetDescription\": \"VP9 video (up to 720p30) and Vorbis stereo audio, in an MKV container.\", \n"
-"                    \"PresetName\": \"VP9 MKV 720p HD\", \n"
+"                    \"PresetName\": \"VP9 MKV 720p30\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -5358,7 +5358,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 720, \n"
 "                    \"PresetDescription\": \"VP9 video (up to 576p25) and Vorbis stereo audio, in an MKV container.\", \n"
-"                    \"PresetName\": \"VP9 MKV 576p PAL SD\", \n"
+"                    \"PresetName\": \"VP9 MKV 576p25\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -5452,7 +5452,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 720, \n"
 "                    \"PresetDescription\": \"VP9 video (up to 480p30) and Vorbis stereo audio, in an MKV container.\", \n"
-"                    \"PresetName\": \"VP9 MKV 480p SD\", \n"
+"                    \"PresetName\": \"VP9 MKV 480p30\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -6342,7 +6342,7 @@ const char hb_builtin_presets_json[] =
 "            \"x264Option\": \"\", \n"
 "            \"x264UseAdvancedOptions\": false\n"
 "        }, \n"
-"        \"VersionMajor\": 15, \n"
+"        \"VersionMajor\": 16, \n"
 "        \"VersionMicro\": 0, \n"
 "        \"VersionMinor\": 0\n"
 "    }\n"
diff --git a/libhb/libhb_presets.list b/libhb/libhb_presets.list
index 20e034368..40f287c64 100644
--- a/libhb/libhb_presets.list
+++ b/libhb/libhb_presets.list
@@ -1,6 +1,6 @@
 <resources>
     <section name="PresetTemplate">
-        <integer name="VersionMajor" value="15" />
+        <integer name="VersionMajor" value="16" />
         <integer name="VersionMinor" value="0" />
         <integer name="VersionMicro" value="0" />
         <json name="Preset" file="preset_template.json" />
diff --git a/libhb/preset_builtin.json b/libhb/preset_builtin.json
index f62bea0fe..3390ed704 100644
--- a/libhb/preset_builtin.json
+++ b/libhb/preset_builtin.json
@@ -66,7 +66,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "H.264 video (up to 1080p30) and AAC stereo audio, in an MP4 container.",
-                    "PresetName": "Fast 1080p Full HD",
+                    "PresetName": "Fast 1080p30",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -165,7 +165,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "H.264 video (up to 720p30) and AAC stereo audio, in an MP4 container.",
-                    "PresetName": "Fast 720p HD",
+                    "PresetName": "Fast 720p30",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -264,7 +264,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "H.264 video (up to 576p25) and AAC stereo audio, in an MP4 container.",
-                    "PresetName": "Fast 576p PAL SD",
+                    "PresetName": "Fast 576p25",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -363,7 +363,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "H.264 video (up to 480p30) and AAC stereo audio, in an MP4 container.",
-                    "PresetName": "Fast 480p SD",
+                    "PresetName": "Fast 480p30",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -476,7 +476,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "High quality H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container.",
-                    "PresetName": "HQ 1080p Full HD Surround",
+                    "PresetName": "HQ 1080p30 Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -589,7 +589,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "High quality H.264 video (up to 720p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container.",
-                    "PresetName": "HQ 720p HD Surround",
+                    "PresetName": "HQ 720p30 Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -702,7 +702,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "High quality H.264 video (up to 576p25), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container.",
-                    "PresetName": "HQ 576p PAL SD Surround",
+                    "PresetName": "HQ 576p25 Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -815,7 +815,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "High quality H.264 video (up to 480p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container.",
-                    "PresetName": "HQ 480p SD Surround",
+                    "PresetName": "HQ 480p30 Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -928,7 +928,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "Super high quality H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container.",
-                    "PresetName": "Super HQ 1080p Full HD Surround",
+                    "PresetName": "Super HQ 1080p30 Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -1041,7 +1041,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "Super high quality H.264 video (up to 720p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container.",
-                    "PresetName": "Super HQ 720p HD Surround",
+                    "PresetName": "Super HQ 720p30 Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -1154,7 +1154,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "Super high quality H.264 video (up to 576p25), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container.",
-                    "PresetName": "Super HQ 576p PAL SD Surround",
+                    "PresetName": "Super HQ 576p25 Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -1267,7 +1267,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "Super high quality H.264 video (up to 480p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container.",
-                    "PresetName": "Super HQ 480p SD Surround",
+                    "PresetName": "Super HQ 480p30 Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -1373,7 +1373,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "H.264 video (up to 1080p30) and AAC stereo audio, in an MP4 container. Compatible with Android devices.",
-                    "PresetName": "Android 1080p Full HD",
+                    "PresetName": "Android 1080p30",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -1472,7 +1472,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "H.264 video (up to 720p30) and AAC stereo audio, in an MP4 container. Compatible with Android devices.",
-                    "PresetName": "Android 720p HD",
+                    "PresetName": "Android 720p30",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -1571,7 +1571,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "H.264 video (up to 576p25) and AAC stereo audio, in an MP4 container. Compatible with Android devices.",
-                    "PresetName": "Android 576p PAL SD",
+                    "PresetName": "Android 576p25",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -1670,7 +1670,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "H.264 video (up to 480p30) and AAC stereo audio, in an MP4 container. Compatible with Android devices.",
-                    "PresetName": "Android 480p SD",
+                    "PresetName": "Android 480p30",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -1783,7 +1783,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "H.264 video (up to 1080p60), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPad Pro; iPad Air; iPad mini 2nd, 3rd Generation and later; Apple TV 4th Generation and later.",
-                    "PresetName": "Apple 1080p60 Full HD Surround",
+                    "PresetName": "Apple 1080p60 Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -1896,7 +1896,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 5, 5S, 6, 6s, and later; iPod touch 6th Generation and later; iPad Pro; iPad Air; iPad 3rd, 4th Generation and later; iPad mini; Apple TV 3rd Generation and later.",
-                    "PresetName": "Apple 1080p Full HD Surround",
+                    "PresetName": "Apple 1080p30 Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -2009,7 +2009,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "H.264 video (up to 720p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 4 and later; iPod touch 4th, 5th Generation and later; Apple TV 2nd Generation and later.",
-                    "PresetName": "Apple 720p HD Surround",
+                    "PresetName": "Apple 720p30 Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -2122,7 +2122,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "H.264 video (up to 540p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 1st Generation, 3G, 3GS, and later; iPod touch 1st, 2nd, 3rd Generation and later; iPod Classic; Apple TV 1st Generation and later.",
-                    "PresetName": "Apple 540p qHD Surround",
+                    "PresetName": "Apple 540p30 Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -2221,7 +2221,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "H.264 video (up to 240p30) and AAC stereo audio, in an MP4 container. Compatible with Apple iPod 5th Generation and later.",
-                    "PresetName": "Apple 240p QVGA",
+                    "PresetName": "Apple 240p30",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -2334,7 +2334,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Google Chromecast.",
-                    "PresetName": "Chromecast 1080p Full HD Surround",
+                    "PresetName": "Chromecast 1080p30 Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -2447,7 +2447,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) audio, in an MP4 container. Compatible with Amazon Fire TV.",
-                    "PresetName": "Fire TV 1080p Full HD Surround",
+                    "PresetName": "Fire TV 1080p30 Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -2560,7 +2560,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Playstation 3 and 4.",
-                    "PresetName": "Playstation 1080p Full HD Surround",
+                    "PresetName": "Playstation 1080p30 Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -2659,7 +2659,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "H.264 video (up to 720p30) and AAC stereo audio, in an MP4 container. Compatible with Playstation Vita TV.",
-                    "PresetName": "Playstation Vita TV 720p HD",
+                    "PresetName": "Playstation Vita TV 720p30",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -2758,7 +2758,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "H.264 video (up to 540p30) and AAC stereo audio, in an MP4 container. Compatible with Playstation Vita.",
-                    "PresetName": "Playstation Vita 540p qHD",
+                    "PresetName": "Playstation Vita 540p30",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -2874,7 +2874,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "H.265 video (up to 2160p60), AAC stereo audio, and surround audio, in an MKV container. Compatible with Roku 4.",
-                    "PresetName": "Roku 2160p60 4K UHD-1 Surround",
+                    "PresetName": "Roku 2160p60 4K Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -2990,7 +2990,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "H.265 video (up to 2160p30), AAC stereo audio, and surround audio, in an MKV container. Compatible with Roku 4.",
-                    "PresetName": "Roku 2160p 4K UHD-1 Surround",
+                    "PresetName": "Roku 2160p30 4K Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -3102,8 +3102,8 @@
                     "PictureHeight": 1080,
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
-                    "PresetDescription": "H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Roku 1080p Full HD models.",
-                    "PresetName": "Roku 1080p Full HD Surround",
+                    "PresetDescription": "H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Roku 1080p models.",
+                    "PresetName": "Roku 1080p30 Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -3215,8 +3215,8 @@
                     "PictureHeight": 720,
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
-                    "PresetDescription": "H.264 video (up to 720p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Roku 720p HD models.",
-                    "PresetName": "Roku 720p HD Surround",
+                    "PresetDescription": "H.264 video (up to 720p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Roku 720p models.",
+                    "PresetName": "Roku 720p30 Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -3315,7 +3315,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "H.264 video (up to 576p25) and AAC stereo audio, in an MP4 container. Compatible with Roku standard definition models.",
-                    "PresetName": "Roku 576p PAL SD",
+                    "PresetName": "Roku 576p25",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -3414,7 +3414,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "H.264 video (up to 480p30) and AAC stereo audio, in an MP4 container. Compatible with Roku standard definition models.",
-                    "PresetName": "Roku 480p SD",
+                    "PresetName": "Roku 480p30",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -3513,7 +3513,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "H.264 video (up to 1080p30) and AAC stereo audio, in an MP4 container. Compatible with Windows Mobile devices with Qualcomm Snapdragon 800 (MSM8974), S4 (MSM8x30, MSM8960), and better CPUs.",
-                    "PresetName": "Windows Mobile 1080p Full HD",
+                    "PresetName": "Windows Mobile 1080p30",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -3612,7 +3612,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "H.264 video (up to 720p30) and AAC stereo audio, in an MP4 container. Compatible with Windows Mobile devices with Qualcomm Snapdragon S4 (MSM8x27), S2 (MSM8x55), S1 (MSM8x50), and better CPUs.",
-                    "PresetName": "Windows Mobile 720p HD",
+                    "PresetName": "Windows Mobile 720p30",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -3711,7 +3711,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "H.264 video (up to 540p30) and AAC stereo audio, in an MP4 container. Compatible with Windows Mobile devices with Qualcomm Snapdragon 200 (MSM8210, MSM8212) and better CPUs.",
-                    "PresetName": "Windows Mobile 540p qHD",
+                    "PresetName": "Windows Mobile 540p30",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -3810,7 +3810,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "H.264 video (up to 480p30) and AAC stereo audio, in an MP4 container. Compatible with Windows Mobile devices with Qualcomm Snapdragon S1 (MSM7x27a) and better CPUs.",
-                    "PresetName": "Windows Mobile 480p SD",
+                    "PresetName": "Windows Mobile 480p30",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -3923,7 +3923,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Xbox One.",
-                    "PresetName": "Xbox 1080p Full HD Surround",
+                    "PresetName": "Xbox 1080p30 Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -4036,7 +4036,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Xbox 360.",
-                    "PresetName": "Xbox Legacy 1080p Full HD Surround",
+                    "PresetName": "Xbox Legacy 1080p30 Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -4142,7 +4142,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "H.264 video (up to 1080p30) and AAC stereo audio, in an MKV container.",
-                    "PresetName": "H.264 MKV 1080p Full HD",
+                    "PresetName": "H.264 MKV 1080p30",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -4241,7 +4241,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "H.264 video (up to 720p30) and AAC stereo audio, in an MKV container.",
-                    "PresetName": "H.264 MKV 720p HD",
+                    "PresetName": "H.264 MKV 720p30",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -4340,7 +4340,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "H.264 video (up to 576p25) and AAC stereo audio, in an MKV container.",
-                    "PresetName": "H.264 MKV 576p PAL SD",
+                    "PresetName": "H.264 MKV 576p25",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -4439,7 +4439,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "H.264 video (up to 480p30) and AAC stereo audio, in an MKV container.",
-                    "PresetName": "H.264 MKV 480p SD",
+                    "PresetName": "H.264 MKV 480p30",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -4538,7 +4538,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "H.265 video (up to 1080p30) and AAC stereo audio, in an MKV container.",
-                    "PresetName": "H.265 MKV 1080p Full HD",
+                    "PresetName": "H.265 MKV 1080p30",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -4637,7 +4637,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "H.265 video (up to 720p30) and AAC stereo audio, in an MKV container.",
-                    "PresetName": "H.265 MKV 720p HD",
+                    "PresetName": "H.265 MKV 720p30",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -4736,7 +4736,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "H.265 video (up to 576p25) and AAC stereo audio, in an MKV container.",
-                    "PresetName": "H.265 MKV 576p PAL SD",
+                    "PresetName": "H.265 MKV 576p25",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -4835,7 +4835,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "H.265 video (up to 480p30) and AAC stereo audio, in an MKV container.",
-                    "PresetName": "H.265 MKV 480p SD",
+                    "PresetName": "H.265 MKV 480p30",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -4933,7 +4933,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "VP8 video (up to 1080p30) and Vorbis stereo audio, in an MKV container.",
-                    "PresetName": "VP8 MKV 1080p Full HD",
+                    "PresetName": "VP8 MKV 1080p30",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -5031,7 +5031,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "VP8 video (up to 720p30) and Vorbis stereo audio, in an MKV container.",
-                    "PresetName": "VP8 MKV 720p HD",
+                    "PresetName": "VP8 MKV 720p30",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -5129,7 +5129,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "VP8 video (up to 576p25) and Vorbis stereo audio, in an MKV container.",
-                    "PresetName": "VP8 MKV 576p PAL SD",
+                    "PresetName": "VP8 MKV 576p25",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -5227,7 +5227,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "VP8 video (up to 480p30) and Vorbis stereo audio, in an MKV container.",
-                    "PresetName": "VP8 MKV 480p SD",
+                    "PresetName": "VP8 MKV 480p30",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -5325,7 +5325,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "VP9 video (up to 1080p30) and Vorbis stereo audio, in an MKV container.",
-                    "PresetName": "VP9 MKV 1080p Full HD",
+                    "PresetName": "VP9 MKV 1080p30",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -5423,7 +5423,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "VP9 video (up to 720p30) and Vorbis stereo audio, in an MKV container.",
-                    "PresetName": "VP9 MKV 720p HD",
+                    "PresetName": "VP9 MKV 720p30",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -5521,7 +5521,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "VP9 video (up to 576p25) and Vorbis stereo audio, in an MKV container.",
-                    "PresetName": "VP9 MKV 576p PAL SD",
+                    "PresetName": "VP9 MKV 576p25",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -5619,7 +5619,7 @@
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
                     "PresetDescription": "VP9 video (up to 480p30) and Vorbis stereo audio, in an MKV container.",
-                    "PresetName": "VP9 MKV 480p SD",
+                    "PresetName": "VP9 MKV 480p30",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,