diff --git a/data/noiseprofiles.json b/data/noiseprofiles.json
index 6c37409cae9f..4d98568e1298 100644
--- a/data/noiseprofiles.json
+++ b/data/noiseprofiles.json
@@ -3717,15 +3717,15 @@
},
{
"comment": "coolpix p950 contributed by macgyver",
- "model": "COOLPIX P950",
+ "model": "Coolpix P950",
"profiles": [
- {"name": "COOLPIX P950 iso 100", "iso": 100, "a": [3.08940047120963e-05, 1.80173568496426e-05, 3.09706425048469e-05], "b": [4.14620218447301e-08, 3.32618203651042e-08, 4.44812624971198e-08]},
- {"name": "COOLPIX P950 iso 200", "iso": 200, "a": [5.86429460994485e-05, 3.4057882740329e-05, 5.87605559463821e-05], "b": [9.30933509953004e-08, 8.08863942577506e-08, 8.79051520441948e-08]},
- {"name": "COOLPIX P950 iso 400", "iso": 400, "a": [0.000115978675816635, 6.68775919030315e-05, 0.000115798608673914], "b": [2.1073770396501e-07, 1.91813147125633e-07, 1.9818112671877e-07]},
- {"name": "COOLPIX P950 iso 800", "iso": 800, "a": [0.00024848773213349, 0.000142992967613072, 0.000248407142946832], "b": [5.2614396024791e-07, 4.48250065048892e-07, 4.94223183016433e-07]},
- {"name": "COOLPIX P950 iso 1600", "iso": 1600, "a": [0.000431897055622654, 0.000249765985060502, 0.000430172450114936], "b": [1.20513899319663e-06, 9.92663140466436e-07, 1.12098113568272e-06]},
- {"name": "COOLPIX P950 iso 3200", "iso": 3200, "a": [0.000787099916289497, 0.000457292302613123, 0.000786390143378469], "b": [3.68894625379891e-06, 2.90110779385909e-06, 3.31561487951578e-06]},
- {"name": "COOLPIX P950 iso 6400", "iso": 6400, "a": [0.00165412515361554, 0.000967170290626923, 0.00165315045725615], "b": [1.43323623361179e-05, 1.21087199860845e-05, 1.26756695688545e-05]}
+ {"name": "Coolpix P950 iso 100", "iso": 100, "a": [3.08940047120963e-05, 1.80173568496426e-05, 3.09706425048469e-05], "b": [4.14620218447301e-08, 3.32618203651042e-08, 4.44812624971198e-08]},
+ {"name": "Coolpix P950 iso 200", "iso": 200, "a": [5.86429460994485e-05, 3.4057882740329e-05, 5.87605559463821e-05], "b": [9.30933509953004e-08, 8.08863942577506e-08, 8.79051520441948e-08]},
+ {"name": "Coolpix P950 iso 400", "iso": 400, "a": [0.000115978675816635, 6.68775919030315e-05, 0.000115798608673914], "b": [2.1073770396501e-07, 1.91813147125633e-07, 1.9818112671877e-07]},
+ {"name": "Coolpix P950 iso 800", "iso": 800, "a": [0.00024848773213349, 0.000142992967613072, 0.000248407142946832], "b": [5.2614396024791e-07, 4.48250065048892e-07, 4.94223183016433e-07]},
+ {"name": "Coolpix P950 iso 1600", "iso": 1600, "a": [0.000431897055622654, 0.000249765985060502, 0.000430172450114936], "b": [1.20513899319663e-06, 9.92663140466436e-07, 1.12098113568272e-06]},
+ {"name": "Coolpix P950 iso 3200", "iso": 3200, "a": [0.000787099916289497, 0.000457292302613123, 0.000786390143378469], "b": [3.68894625379891e-06, 2.90110779385909e-06, 3.31561487951578e-06]},
+ {"name": "Coolpix P950 iso 6400", "iso": 6400, "a": [0.00165412515361554, 0.000967170290626923, 0.00165315045725615], "b": [1.43323623361179e-05, 1.21087199860845e-05, 1.26756695688545e-05]}
]
},
{
@@ -3756,51 +3756,51 @@
"comment": "nikon p7700 by Roland Kluge",
"model": "Coolpix P7700",
"profiles": [
- {"name": "COOLPIX P7700 iso 80", "iso": 80, "a": [1.2776921289531e-05, 7.90119667388412e-06, 1.76426667403788e-05], "b": [2.76938320832777e-08, 5.2891167997244e-09, 4.7108242179853e-08]},
- {"name": "COOLPIX P7700 iso 100", "iso": 100, "a": [2.23360167349127e-05, 1.02488889368084e-05, 1.68919328435802e-05], "b": [4.51922028749587e-09, 2.15570599751036e-08, 5.50398402111517e-08]},
- {"name": "COOLPIX P7700 iso 200", "iso": 200, "a": [4.15045652670726e-05, 1.92590675437449e-05, 3.25292866338876e-05], "b": [8.14516771994551e-09, 5.62635978001346e-08, 1.05163724140114e-07]},
- {"name": "COOLPIX P7700 iso 400", "iso": 400, "a": [8.12739016168597e-05, 3.73888717586382e-05, 6.34384390636471e-05], "b": [6.27250557313706e-09, 1.46076265082481e-07, 3.13456551316114e-07]},
- {"name": "COOLPIX P7700 iso 800", "iso": 800, "a": [0.000159559922423397, 7.40557043653392e-05, 0.000126117819737185], "b": [2.61564026436144e-07, 3.76707696456378e-07, 5.85520600144935e-07]},
- {"name": "COOLPIX P7700 iso 1600", "iso": 1600, "a": [0.000312102869892038, 0.000146173952414192, 0.000248945518763691], "b": [9.93575992812139e-07, 1.317304427659e-06, 1.74315336736036e-06]},
- {"name": "COOLPIX P7700 iso 3200", "iso": 3200, "a": [0.000626123326482975, 0.000295166797119991, 0.000504593455482756], "b": [3.16773768295435e-06, 4.09862082222233e-06, 4.89752965084551e-06]}
+ {"name": "Coolpix P7700 iso 80", "iso": 80, "a": [1.2776921289531e-05, 7.90119667388412e-06, 1.76426667403788e-05], "b": [2.76938320832777e-08, 5.2891167997244e-09, 4.7108242179853e-08]},
+ {"name": "Coolpix P7700 iso 100", "iso": 100, "a": [2.23360167349127e-05, 1.02488889368084e-05, 1.68919328435802e-05], "b": [4.51922028749587e-09, 2.15570599751036e-08, 5.50398402111517e-08]},
+ {"name": "Coolpix P7700 iso 200", "iso": 200, "a": [4.15045652670726e-05, 1.92590675437449e-05, 3.25292866338876e-05], "b": [8.14516771994551e-09, 5.62635978001346e-08, 1.05163724140114e-07]},
+ {"name": "Coolpix P7700 iso 400", "iso": 400, "a": [8.12739016168597e-05, 3.73888717586382e-05, 6.34384390636471e-05], "b": [6.27250557313706e-09, 1.46076265082481e-07, 3.13456551316114e-07]},
+ {"name": "Coolpix P7700 iso 800", "iso": 800, "a": [0.000159559922423397, 7.40557043653392e-05, 0.000126117819737185], "b": [2.61564026436144e-07, 3.76707696456378e-07, 5.85520600144935e-07]},
+ {"name": "Coolpix P7700 iso 1600", "iso": 1600, "a": [0.000312102869892038, 0.000146173952414192, 0.000248945518763691], "b": [9.93575992812139e-07, 1.317304427659e-06, 1.74315336736036e-06]},
+ {"name": "Coolpix P7700 iso 3200", "iso": 3200, "a": [0.000626123326482975, 0.000295166797119991, 0.000504593455482756], "b": [3.16773768295435e-06, 4.09862082222233e-06, 4.89752965084551e-06]}
]
},
{
"comment": "coolpix p1000 contributed by Macchiato17",
- "model": "COOLPIX P1000",
+ "model": "Coolpix P1000",
"profiles": [
- {"name": "COOLPIX P1000 iso 100", "iso": 100, "a": [2.57508286722786e-05, 1.95388487765373e-05, 4.97229657396721e-05], "b": [2.6236463880047e-08, 1.97825987262469e-08, 2.46730224977539e-08]},
- {"name": "COOLPIX P1000 iso 200", "iso": 200, "a": [4.96663329094346e-05, 3.72140364356545e-05, 9.52224848954192e-05], "b": [5.61301215013723e-08, 4.03795520131046e-08, 6.24563879291875e-08]},
- {"name": "COOLPIX P1000 iso 400", "iso": 400, "a": [9.68185216938081e-05, 7.2800225382582e-05, 0.000186165536071972], "b": [1.49572692493647e-07, 1.0437568422798e-07, 1.49588534535682e-07]},
- {"name": "COOLPIX P1000 iso 800", "iso": 800, "a": [0.000189636016183489, 0.000143151598014221, 0.000367375857629364], "b": [3.74625448858935e-07, 2.69069574310053e-07, 3.58656668882945e-07]},
- {"name": "COOLPIX P1000 iso 1600", "iso": 1600, "a": [0.000331831008806297, 0.000252735027543622, 0.000649289539036097], "b": [9.19841183912458e-07, 6.00621777018493e-07, 7.41518440452715e-07]},
- {"name": "COOLPIX P1000 iso 3200", "iso": 3200, "a": [0.000610477796622481, 0.000472908965112135, 0.00118841663826333], "b": [3.31042139038074e-06, 2.30588478378943e-06, 2.10001397169166e-06]},
- {"name": "COOLPIX P1000 iso 6400", "iso": 6400, "a": [0.00134016543810822, 0.00104651488055139, 0.00250452725828817], "b": [1.25424843402383e-05, 9.54538732813486e-06, 6.88161897359961e-06]}
+ {"name": "Coolpix P1000 iso 100", "iso": 100, "a": [2.57508286722786e-05, 1.95388487765373e-05, 4.97229657396721e-05], "b": [2.6236463880047e-08, 1.97825987262469e-08, 2.46730224977539e-08]},
+ {"name": "Coolpix P1000 iso 200", "iso": 200, "a": [4.96663329094346e-05, 3.72140364356545e-05, 9.52224848954192e-05], "b": [5.61301215013723e-08, 4.03795520131046e-08, 6.24563879291875e-08]},
+ {"name": "Coolpix P1000 iso 400", "iso": 400, "a": [9.68185216938081e-05, 7.2800225382582e-05, 0.000186165536071972], "b": [1.49572692493647e-07, 1.0437568422798e-07, 1.49588534535682e-07]},
+ {"name": "Coolpix P1000 iso 800", "iso": 800, "a": [0.000189636016183489, 0.000143151598014221, 0.000367375857629364], "b": [3.74625448858935e-07, 2.69069574310053e-07, 3.58656668882945e-07]},
+ {"name": "Coolpix P1000 iso 1600", "iso": 1600, "a": [0.000331831008806297, 0.000252735027543622, 0.000649289539036097], "b": [9.19841183912458e-07, 6.00621777018493e-07, 7.41518440452715e-07]},
+ {"name": "Coolpix P1000 iso 3200", "iso": 3200, "a": [0.000610477796622481, 0.000472908965112135, 0.00118841663826333], "b": [3.31042139038074e-06, 2.30588478378943e-06, 2.10001397169166e-06]},
+ {"name": "Coolpix P1000 iso 6400", "iso": 6400, "a": [0.00134016543810822, 0.00104651488055139, 0.00250452725828817], "b": [1.25424843402383e-05, 9.54538732813486e-06, 6.88161897359961e-06]}
]
},
{
"comment": "coolpix a contributed by engel",
"model": "Coolpix A",
"profiles": [
- {"name": "COOLPIX A iso 100", "iso": 100, "a": [2.83468119214041e-06, 2.04777540382704e-06, 4.83592393956174e-06], "b": [6.83891475736177e-09, 2.19199211397333e-09, 9.51621423337986e-09]},
- {"name": "COOLPIX A iso 200", "iso": 200, "a": [5.71310014102686e-06, 4.05892915848712e-06, 9.40976253041875e-06], "b": [1.50755853341668e-08, 5.99135889777733e-09, 1.9538916060471e-08]},
- {"name": "COOLPIX A iso 400", "iso": 400, "a": [1.15746599719124e-05, 7.93101590735365e-06, 1.81598551568848e-05], "b": [3.19112530991472e-08, 1.4194802357877e-08, 4.31743551181213e-08]},
- {"name": "COOLPIX A iso 800", "iso": 800, "a": [2.18568759430262e-05, 1.52433990518043e-05, 3.54778096147797e-05], "b": [6.87677545500588e-08, 4.46097805342411e-08, 9.60628677931109e-08]},
- {"name": "COOLPIX A iso 1600", "iso": 1600, "a": [4.64209881238938e-05, 3.13342136801771e-05, 7.05342504049816e-05], "b": [1.67047380722379e-07, 1.14954459041258e-07, 2.44547058999541e-07]},
- {"name": "COOLPIX A iso 3200", "iso": 3200, "a": [0.000101519542937226, 6.52891192572566e-05, 0.00014844696650453], "b": [4.84339761884913e-07, 3.47029920527135e-07, 5.26666403972966e-07]},
- {"name": "COOLPIX A iso 6400", "iso": 6400, "a": [0.000212322470278363, 0.000144277591007012, 0.000324560226078338], "b": [1.15310652513914e-06, 8.3785644428418e-07, 1.30533118973421e-06]}
+ {"name": "Coolpix A iso 100", "iso": 100, "a": [2.83468119214041e-06, 2.04777540382704e-06, 4.83592393956174e-06], "b": [6.83891475736177e-09, 2.19199211397333e-09, 9.51621423337986e-09]},
+ {"name": "Coolpix A iso 200", "iso": 200, "a": [5.71310014102686e-06, 4.05892915848712e-06, 9.40976253041875e-06], "b": [1.50755853341668e-08, 5.99135889777733e-09, 1.9538916060471e-08]},
+ {"name": "Coolpix A iso 400", "iso": 400, "a": [1.15746599719124e-05, 7.93101590735365e-06, 1.81598551568848e-05], "b": [3.19112530991472e-08, 1.4194802357877e-08, 4.31743551181213e-08]},
+ {"name": "Coolpix A iso 800", "iso": 800, "a": [2.18568759430262e-05, 1.52433990518043e-05, 3.54778096147797e-05], "b": [6.87677545500588e-08, 4.46097805342411e-08, 9.60628677931109e-08]},
+ {"name": "Coolpix A iso 1600", "iso": 1600, "a": [4.64209881238938e-05, 3.13342136801771e-05, 7.05342504049816e-05], "b": [1.67047380722379e-07, 1.14954459041258e-07, 2.44547058999541e-07]},
+ {"name": "Coolpix A iso 3200", "iso": 3200, "a": [0.000101519542937226, 6.52891192572566e-05, 0.00014844696650453], "b": [4.84339761884913e-07, 3.47029920527135e-07, 5.26666403972966e-07]},
+ {"name": "Coolpix A iso 6400", "iso": 6400, "a": [0.000212322470278363, 0.000144277591007012, 0.000324560226078338], "b": [1.15310652513914e-06, 8.3785644428418e-07, 1.30533118973421e-06]}
]
},
{
"comment": "coolpix b700 contributed by antonio",
- "model": "COOLPIX B700",
- "profiles": [
- {"name": "COOLPIX B700 iso 100", "iso": 100, "a": [5.75272404639185e-05, 2.69382674288604e-05, 3.68291011064301e-05], "b": [3.76932853741586e-08, 3.79150037275118e-08, 3.79651863909323e-08]},
- {"name": "COOLPIX B700 iso 200", "iso": 200, "a": [0.00010814766442904, 5.01598659146415e-05, 6.91683845899076e-05], "b": [7.15901332809991e-08, 7.21514656971398e-08, 7.97140039271403e-08]},
- {"name": "COOLPIX B700 iso 400", "iso": 400, "a": [0.000205061737943572, 9.39681043675363e-05, 0.000131362907497122], "b": [1.91243621394674e-07, 1.59444152903933e-07, 1.94710920099097e-07]},
- {"name": "COOLPIX B700 iso 800", "iso": 800, "a": [0.000387604636962371, 0.000177279173797563, 0.000247608493153156], "b": [3.38036002397396e-07, 3.23535787366141e-07, 3.66303151005016e-07]},
- {"name": "COOLPIX B700 iso 1600", "iso": 1600, "a": [0.000783575529995924, 0.000356260110605634, 0.000500775689205777], "b": [7.61682248207613e-07, 8.14212164648119e-07, 9.36106033208429e-07]},
- {"name": "COOLPIX B700 iso 3200", "iso": 3200, "a": [0.00158583541244515, 0.000722380526693797, 0.00102773902442005], "b": [2.33406952882108e-06, 2.73969836162451e-06, 3.10275892379208e-06]}
+ "model": "Coolpix B700",
+ "profiles": [
+ {"name": "Coolpix B700 iso 100", "iso": 100, "a": [5.75272404639185e-05, 2.69382674288604e-05, 3.68291011064301e-05], "b": [3.76932853741586e-08, 3.79150037275118e-08, 3.79651863909323e-08]},
+ {"name": "Coolpix B700 iso 200", "iso": 200, "a": [0.00010814766442904, 5.01598659146415e-05, 6.91683845899076e-05], "b": [7.15901332809991e-08, 7.21514656971398e-08, 7.97140039271403e-08]},
+ {"name": "Coolpix B700 iso 400", "iso": 400, "a": [0.000205061737943572, 9.39681043675363e-05, 0.000131362907497122], "b": [1.91243621394674e-07, 1.59444152903933e-07, 1.94710920099097e-07]},
+ {"name": "Coolpix B700 iso 800", "iso": 800, "a": [0.000387604636962371, 0.000177279173797563, 0.000247608493153156], "b": [3.38036002397396e-07, 3.23535787366141e-07, 3.66303151005016e-07]},
+ {"name": "Coolpix B700 iso 1600", "iso": 1600, "a": [0.000783575529995924, 0.000356260110605634, 0.000500775689205777], "b": [7.61682248207613e-07, 8.14212164648119e-07, 9.36106033208429e-07]},
+ {"name": "Coolpix B700 iso 3200", "iso": 3200, "a": [0.00158583541244515, 0.000722380526693797, 0.00102773902442005], "b": [2.33406952882108e-06, 2.73969836162451e-06, 3.10275892379208e-06]}
]
},
{
diff --git a/data/styles/darktable_Nikon_COOLPIX B700.dtstyle b/data/styles/darktable_Nikon_Coolpix B700.dtstyle
similarity index 97%
rename from data/styles/darktable_Nikon_COOLPIX B700.dtstyle
rename to data/styles/darktable_Nikon_Coolpix B700.dtstyle
index 0057651e5a77..1213765ce45e 100644
--- a/data/styles/darktable_Nikon_COOLPIX B700.dtstyle
+++ b/data/styles/darktable_Nikon_Coolpix B700.dtstyle
@@ -1,2 +1,2 @@
-_l10n_darktable|_l10n_camera styles|Nikon|Coolpix...|COOLPIX B700
+_l10n_darktable|_l10n_camera styles|Nikon|Coolpix...|Coolpix B700
diff --git a/data/styles/darktable_Nikon_COOLPIX P1000.dtstyle b/data/styles/darktable_Nikon_Coolpix P1000.dtstyle
similarity index 97%
rename from data/styles/darktable_Nikon_COOLPIX P1000.dtstyle
rename to data/styles/darktable_Nikon_Coolpix P1000.dtstyle
index a6afe71b4e61..f3732b7dfd67 100644
--- a/data/styles/darktable_Nikon_COOLPIX P1000.dtstyle
+++ b/data/styles/darktable_Nikon_Coolpix P1000.dtstyle
@@ -1,2 +1,2 @@
-_l10n_darktable|_l10n_camera styles|Nikon|Coolpix...|COOLPIX P1000
+_l10n_darktable|_l10n_camera styles|Nikon|Coolpix...|Coolpix P1000
diff --git a/data/styles/darktable_Nikon_COOLPIX P950.dtstyle b/data/styles/darktable_Nikon_Coolpix P950.dtstyle
similarity index 97%
rename from data/styles/darktable_Nikon_COOLPIX P950.dtstyle
rename to data/styles/darktable_Nikon_Coolpix P950.dtstyle
index b7603846ef3d..a53ca715a701 100644
--- a/data/styles/darktable_Nikon_COOLPIX P950.dtstyle
+++ b/data/styles/darktable_Nikon_Coolpix P950.dtstyle
@@ -1,2 +1,2 @@
-_l10n_darktable|_l10n_camera styles|Nikon|Coolpix...|COOLPIX P950
+_l10n_darktable|_l10n_camera styles|Nikon|Coolpix...|Coolpix P950
diff --git a/data/wb_presets.json b/data/wb_presets.json
index 9803ef5c01a2..d966142ec2ba 100644
--- a/data/wb_presets.json
+++ b/data/wb_presets.json
@@ -46367,7 +46367,7 @@
]
},
{
- "model": "COOLPIX P1000",
+ "model": "Coolpix P1000",
"presets": [
{
"name": "Direct Sunlight",