Cleanup: More byte -> byte4 renaming for consistency.

7 files changed, 323 insertions, 323 deletions

diff --git a/intern/cycles/kernel/kernel_textures.h b/intern/cycles/kernel/kernel_textures.h
index 12eb8849c2f..86979d8c31f 100644
--- a/intern/cycles/kernel/kernel_textures.h
+++ b/intern/cycles/kernel/kernel_textures.h
@@ -86,154 +86,154 @@ KERNEL_IMAGE_TEX(float4, texture_image3d_float4, __tex_image_float4_3d_003)
 KERNEL_IMAGE_TEX(float4, texture_image3d_float4, __tex_image_float4_3d_004)
 
 /* image */
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_005)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_006)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_007)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_008)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_009)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_010)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_011)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_012)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_013)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_014)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_015)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_016)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_017)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_018)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_019)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_020)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_021)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_022)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_023)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_024)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_025)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_026)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_027)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_028)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_029)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_030)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_031)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_032)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_033)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_034)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_035)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_036)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_037)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_038)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_039)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_040)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_041)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_042)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_043)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_044)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_045)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_046)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_047)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_048)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_049)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_050)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_051)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_052)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_053)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_054)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_055)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_056)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_057)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_058)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_059)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_060)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_061)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_062)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_063)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_064)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_065)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_066)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_067)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_068)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_069)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_070)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_071)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_072)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_073)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_074)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_075)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_076)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_077)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_078)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_079)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_080)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_081)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_082)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_083)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_084)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_085)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_086)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_087)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_088)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_089)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_090)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_091)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_092)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_093)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_094)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_095)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_096)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_097)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_098)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_005)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_006)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_007)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_008)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_009)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_010)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_011)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_012)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_013)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_014)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_015)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_016)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_017)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_018)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_019)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_020)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_021)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_022)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_023)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_024)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_025)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_026)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_027)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_028)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_029)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_030)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_031)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_032)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_033)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_034)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_035)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_036)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_037)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_038)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_039)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_040)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_041)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_042)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_043)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_044)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_045)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_046)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_047)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_048)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_049)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_050)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_051)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_052)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_053)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_054)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_055)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_056)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_057)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_058)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_059)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_060)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_061)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_062)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_063)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_064)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_065)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_066)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_067)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_068)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_069)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_070)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_071)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_072)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_073)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_074)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_075)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_076)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_077)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_078)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_079)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_080)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_081)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_082)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_083)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_084)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_085)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_086)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_087)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_088)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_089)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_090)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_091)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_092)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_093)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_094)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_095)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_096)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_097)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_098)
 
 /* Kepler and above */
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_099)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_100)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_101)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_102)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_103)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_104)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_105)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_106)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_107)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_108)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_109)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_110)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_111)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_112)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_113)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_114)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_115)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_116)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_117)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_118)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_119)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_120)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_121)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_122)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_123)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_124)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_125)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_126)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_127)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_128)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_129)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_130)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_131)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_132)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_133)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_134)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_135)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_136)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_137)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_138)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_139)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_140)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_141)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_142)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_143)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_144)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_145)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_146)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_147)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_148)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_149)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte_150)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_099)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_100)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_101)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_102)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_103)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_104)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_105)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_106)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_107)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_108)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_109)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_110)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_111)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_112)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_113)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_114)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_115)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_116)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_117)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_118)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_119)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_120)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_121)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_122)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_123)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_124)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_125)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_126)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_127)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_128)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_129)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_130)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_131)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_132)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_133)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_134)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_135)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_136)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_137)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_138)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_139)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_140)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_141)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_142)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_143)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_144)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_145)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_146)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_147)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_148)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_149)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_150)
 
 /* packed image (opencl) */
 KERNEL_TEX(uchar4, texture_uchar4, __tex_image_packed)
diff --git a/intern/cycles/kernel/kernels/cpu/kernel.cpp b/intern/cycles/kernel/kernels/cpu/kernel.cpp
index 5fa95f29613..c0a333ab18c 100644
--- a/intern/cycles/kernel/kernels/cpu/kernel.cpp
+++ b/intern/cycles/kernel/kernels/cpu/kernel.cpp
@@ -106,9 +106,9 @@ void kernel_tex_copy(KernelGlobals *kg,
 			tex->extension = extension;
 		}
 	}
-	else if(strstr(name, "__tex_image_byte")) {
+	else if(strstr(name, "__tex_image_byte4")) {
 		texture_image_uchar4 *tex = NULL;
-		int id = atoi(name + strlen("__tex_image_byte_"));
+		int id = atoi(name + strlen("__tex_image_byte4_"));
 		int array_index = id - MAX_FLOAT4_IMAGES;
 
 		if(array_index >= 0 && array_index < MAX_BYTE_IMAGES) {
diff --git a/intern/cycles/kernel/svm/svm_image.h b/intern/cycles/kernel/svm/svm_image.h
index d950fc45b11..1f5ea8cc0ee 100644
--- a/intern/cycles/kernel/svm/svm_image.h
+++ b/intern/cycles/kernel/svm/svm_image.h
@@ -161,154 +161,154 @@ ccl_device float4 svm_image_texture(KernelGlobals *kg, int id, float x, float y,
 		case 2: r = kernel_tex_image_interp(__tex_image_float4_002, x, y); break;
 		case 3: r = kernel_tex_image_interp(__tex_image_float4_003, x, y); break;
 		case 4: r = kernel_tex_image_interp(__tex_image_float4_004, x, y); break;
-		case 5: r = kernel_tex_image_interp(__tex_image_byte_005, x, y); break;
-		case 6: r = kernel_tex_image_interp(__tex_image_byte_006, x, y); break;
-		case 7: r = kernel_tex_image_interp(__tex_image_byte_007, x, y); break;
-		case 8: r = kernel_tex_image_interp(__tex_image_byte_008, x, y); break;
-		case 9: r = kernel_tex_image_interp(__tex_image_byte_009, x, y); break;
-		case 10: r = kernel_tex_image_interp(__tex_image_byte_010, x, y); break;
-		case 11: r = kernel_tex_image_interp(__tex_image_byte_011, x, y); break;
-		case 12: r = kernel_tex_image_interp(__tex_image_byte_012, x, y); break;
-		case 13: r = kernel_tex_image_interp(__tex_image_byte_013, x, y); break;
-		case 14: r = kernel_tex_image_interp(__tex_image_byte_014, x, y); break;
-		case 15: r = kernel_tex_image_interp(__tex_image_byte_015, x, y); break;
-		case 16: r = kernel_tex_image_interp(__tex_image_byte_016, x, y); break;
-		case 17: r = kernel_tex_image_interp(__tex_image_byte_017, x, y); break;
-		case 18: r = kernel_tex_image_interp(__tex_image_byte_018, x, y); break;
-		case 19: r = kernel_tex_image_interp(__tex_image_byte_019, x, y); break;
-		case 20: r = kernel_tex_image_interp(__tex_image_byte_020, x, y); break;
-		case 21: r = kernel_tex_image_interp(__tex_image_byte_021, x, y); break;
-		case 22: r = kernel_tex_image_interp(__tex_image_byte_022, x, y); break;
-		case 23: r = kernel_tex_image_interp(__tex_image_byte_023, x, y); break;
-		case 24: r = kernel_tex_image_interp(__tex_image_byte_024, x, y); break;
-		case 25: r = kernel_tex_image_interp(__tex_image_byte_025, x, y); break;
-		case 26: r = kernel_tex_image_interp(__tex_image_byte_026, x, y); break;
-		case 27: r = kernel_tex_image_interp(__tex_image_byte_027, x, y); break;
-		case 28: r = kernel_tex_image_interp(__tex_image_byte_028, x, y); break;
-		case 29: r = kernel_tex_image_interp(__tex_image_byte_029, x, y); break;
-		case 30: r = kernel_tex_image_interp(__tex_image_byte_030, x, y); break;
-		case 31: r = kernel_tex_image_interp(__tex_image_byte_031, x, y); break;
-		case 32: r = kernel_tex_image_interp(__tex_image_byte_032, x, y); break;
-		case 33: r = kernel_tex_image_interp(__tex_image_byte_033, x, y); break;
-		case 34: r = kernel_tex_image_interp(__tex_image_byte_034, x, y); break;
-		case 35: r = kernel_tex_image_interp(__tex_image_byte_035, x, y); break;
-		case 36: r = kernel_tex_image_interp(__tex_image_byte_036, x, y); break;
-		case 37: r = kernel_tex_image_interp(__tex_image_byte_037, x, y); break;
-		case 38: r = kernel_tex_image_interp(__tex_image_byte_038, x, y); break;
-		case 39: r = kernel_tex_image_interp(__tex_image_byte_039, x, y); break;
-		case 40: r = kernel_tex_image_interp(__tex_image_byte_040, x, y); break;
-		case 41: r = kernel_tex_image_interp(__tex_image_byte_041, x, y); break;
-		case 42: r = kernel_tex_image_interp(__tex_image_byte_042, x, y); break;
-		case 43: r = kernel_tex_image_interp(__tex_image_byte_043, x, y); break;
-		case 44: r = kernel_tex_image_interp(__tex_image_byte_044, x, y); break;
-		case 45: r = kernel_tex_image_interp(__tex_image_byte_045, x, y); break;
-		case 46: r = kernel_tex_image_interp(__tex_image_byte_046, x, y); break;
-		case 47: r = kernel_tex_image_interp(__tex_image_byte_047, x, y); break;
-		case 48: r = kernel_tex_image_interp(__tex_image_byte_048, x, y); break;
-		case 49: r = kernel_tex_image_interp(__tex_image_byte_049, x, y); break;
-		case 50: r = kernel_tex_image_interp(__tex_image_byte_050, x, y); break;
-		case 51: r = kernel_tex_image_interp(__tex_image_byte_051, x, y); break;
-		case 52: r = kernel_tex_image_interp(__tex_image_byte_052, x, y); break;
-		case 53: r = kernel_tex_image_interp(__tex_image_byte_053, x, y); break;
-		case 54: r = kernel_tex_image_interp(__tex_image_byte_054, x, y); break;
-		case 55: r = kernel_tex_image_interp(__tex_image_byte_055, x, y); break;
-		case 56: r = kernel_tex_image_interp(__tex_image_byte_056, x, y); break;
-		case 57: r = kernel_tex_image_interp(__tex_image_byte_057, x, y); break;
-		case 58: r = kernel_tex_image_interp(__tex_image_byte_058, x, y); break;
-		case 59: r = kernel_tex_image_interp(__tex_image_byte_059, x, y); break;
-		case 60: r = kernel_tex_image_interp(__tex_image_byte_060, x, y); break;
-		case 61: r = kernel_tex_image_interp(__tex_image_byte_061, x, y); break;
-		case 62: r = kernel_tex_image_interp(__tex_image_byte_062, x, y); break;
-		case 63: r = kernel_tex_image_interp(__tex_image_byte_063, x, y); break;
-		case 64: r = kernel_tex_image_interp(__tex_image_byte_064, x, y); break;
-		case 65: r = kernel_tex_image_interp(__tex_image_byte_065, x, y); break;
-		case 66: r = kernel_tex_image_interp(__tex_image_byte_066, x, y); break;
-		case 67: r = kernel_tex_image_interp(__tex_image_byte_067, x, y); break;
-		case 68: r = kernel_tex_image_interp(__tex_image_byte_068, x, y); break;
-		case 69: r = kernel_tex_image_interp(__tex_image_byte_069, x, y); break;
-		case 70: r = kernel_tex_image_interp(__tex_image_byte_070, x, y); break;
-		case 71: r = kernel_tex_image_interp(__tex_image_byte_071, x, y); break;
-		case 72: r = kernel_tex_image_interp(__tex_image_byte_072, x, y); break;
-		case 73: r = kernel_tex_image_interp(__tex_image_byte_073, x, y); break;
-		case 74: r = kernel_tex_image_interp(__tex_image_byte_074, x, y); break;
-		case 75: r = kernel_tex_image_interp(__tex_image_byte_075, x, y); break;
-		case 76: r = kernel_tex_image_interp(__tex_image_byte_076, x, y); break;
-		case 77: r = kernel_tex_image_interp(__tex_image_byte_077, x, y); break;
-		case 78: r = kernel_tex_image_interp(__tex_image_byte_078, x, y); break;
-		case 79: r = kernel_tex_image_interp(__tex_image_byte_079, x, y); break;
-		case 80: r = kernel_tex_image_interp(__tex_image_byte_080, x, y); break;
-		case 81: r = kernel_tex_image_interp(__tex_image_byte_081, x, y); break;
-		case 82: r = kernel_tex_image_interp(__tex_image_byte_082, x, y); break;
-		case 83: r = kernel_tex_image_interp(__tex_image_byte_083, x, y); break;
-		case 84: r = kernel_tex_image_interp(__tex_image_byte_084, x, y); break;
-		case 85: r = kernel_tex_image_interp(__tex_image_byte_085, x, y); break;
-		case 86: r = kernel_tex_image_interp(__tex_image_byte_086, x, y); break;
-		case 87: r = kernel_tex_image_interp(__tex_image_byte_087, x, y); break;
-		case 88: r = kernel_tex_image_interp(__tex_image_byte_088, x, y); break;
-		case 89: r = kernel_tex_image_interp(__tex_image_byte_089, x, y); break;
-		case 90: r = kernel_tex_image_interp(__tex_image_byte_090, x, y); break;
-		case 91: r = kernel_tex_image_interp(__tex_image_byte_091, x, y); break;
-		case 92: r = kernel_tex_image_interp(__tex_image_byte_092, x, y); break;
+		case 5: r = kernel_tex_image_interp(__tex_image_byte4_005, x, y); break;
+		case 6: r = kernel_tex_image_interp(__tex_image_byte4_006, x, y); break;
+		case 7: r = kernel_tex_image_interp(__tex_image_byte4_007, x, y); break;
+		case 8: r = kernel_tex_image_interp(__tex_image_byte4_008, x, y); break;
+		case 9: r = kernel_tex_image_interp(__tex_image_byte4_009, x, y); break;
+		case 10: r = kernel_tex_image_interp(__tex_image_byte4_010, x, y); break;
+		case 11: r = kernel_tex_image_interp(__tex_image_byte4_011, x, y); break;
+		case 12: r = kernel_tex_image_interp(__tex_image_byte4_012, x, y); break;
+		case 13: r = kernel_tex_image_interp(__tex_image_byte4_013, x, y); break;
+		case 14: r = kernel_tex_image_interp(__tex_image_byte4_014, x, y); break;
+		case 15: r = kernel_tex_image_interp(__tex_image_byte4_015, x, y); break;
+		case 16: r = kernel_tex_image_interp(__tex_image_byte4_016, x, y); break;
+		case 17: r = kernel_tex_image_interp(__tex_image_byte4_017, x, y); break;
+		case 18: r = kernel_tex_image_interp(__tex_image_byte4_018, x, y); break;
+		case 19: r = kernel_tex_image_interp(__tex_image_byte4_019, x, y); break;
+		case 20: r = kernel_tex_image_interp(__tex_image_byte4_020, x, y); break;
+		case 21: r = kernel_tex_image_interp(__tex_image_byte4_021, x, y); break;
+		case 22: r = kernel_tex_image_interp(__tex_image_byte4_022, x, y); break;
+		case 23: r = kernel_tex_image_interp(__tex_image_byte4_023, x, y); break;
+		case 24: r = kernel_tex_image_interp(__tex_image_byte4_024, x, y); break;
+		case 25: r = kernel_tex_image_interp(__tex_image_byte4_025, x, y); break;
+		case 26: r = kernel_tex_image_interp(__tex_image_byte4_026, x, y); break;
+		case 27: r = kernel_tex_image_interp(__tex_image_byte4_027, x, y); break;
+		case 28: r = kernel_tex_image_interp(__tex_image_byte4_028, x, y); break;
+		case 29: r = kernel_tex_image_interp(__tex_image_byte4_029, x, y); break;
+		case 30: r = kernel_tex_image_interp(__tex_image_byte4_030, x, y); break;
+		case 31: r = kernel_tex_image_interp(__tex_image_byte4_031, x, y); break;
+		case 32: r = kernel_tex_image_interp(__tex_image_byte4_032, x, y); break;
+		case 33: r = kernel_tex_image_interp(__tex_image_byte4_033, x, y); break;
+		case 34: r = kernel_tex_image_interp(__tex_image_byte4_034, x, y); break;
+		case 35: r = kernel_tex_image_interp(__tex_image_byte4_035, x, y); break;
+		case 36: r = kernel_tex_image_interp(__tex_image_byte4_036, x, y); break;
+		case 37: r = kernel_tex_image_interp(__tex_image_byte4_037, x, y); break;
+		case 38: r = kernel_tex_image_interp(__tex_image_byte4_038, x, y); break;
+		case 39: r = kernel_tex_image_interp(__tex_image_byte4_039, x, y); break;
+		case 40: r = kernel_tex_image_interp(__tex_image_byte4_040, x, y); break;
+		case 41: r = kernel_tex_image_interp(__tex_image_byte4_041, x, y); break;
+		case 42: r = kernel_tex_image_interp(__tex_image_byte4_042, x, y); break;
+		case 43: r = kernel_tex_image_interp(__tex_image_byte4_043, x, y); break;
+		case 44: r = kernel_tex_image_interp(__tex_image_byte4_044, x, y); break;
+		case 45: r = kernel_tex_image_interp(__tex_image_byte4_045, x, y); break;
+		case 46: r = kernel_tex_image_interp(__tex_image_byte4_046, x, y); break;
+		case 47: r = kernel_tex_image_interp(__tex_image_byte4_047, x, y); break;
+		case 48: r = kernel_tex_image_interp(__tex_image_byte4_048, x, y); break;
+		case 49: r = kernel_tex_image_interp(__tex_image_byte4_049, x, y); break;
+		case 50: r = kernel_tex_image_interp(__tex_image_byte4_050, x, y); break;
+		case 51: r = kernel_tex_image_interp(__tex_image_byte4_051, x, y); break;
+		case 52: r = kernel_tex_image_interp(__tex_image_byte4_052, x, y); break;
+		case 53: r = kernel_tex_image_interp(__tex_image_byte4_053, x, y); break;
+		case 54: r = kernel_tex_image_interp(__tex_image_byte4_054, x, y); break;
+		case 55: r = kernel_tex_image_interp(__tex_image_byte4_055, x, y); break;
+		case 56: r = kernel_tex_image_interp(__tex_image_byte4_056, x, y); break;
+		case 57: r = kernel_tex_image_interp(__tex_image_byte4_057, x, y); break;
+		case 58: r = kernel_tex_image_interp(__tex_image_byte4_058, x, y); break;
+		case 59: r = kernel_tex_image_interp(__tex_image_byte4_059, x, y); break;
+		case 60: r = kernel_tex_image_interp(__tex_image_byte4_060, x, y); break;
+		case 61: r = kernel_tex_image_interp(__tex_image_byte4_061, x, y); break;
+		case 62: r = kernel_tex_image_interp(__tex_image_byte4_062, x, y); break;
+		case 63: r = kernel_tex_image_interp(__tex_image_byte4_063, x, y); break;
+		case 64: r = kernel_tex_image_interp(__tex_image_byte4_064, x, y); break;
+		case 65: r = kernel_tex_image_interp(__tex_image_byte4_065, x, y); break;
+		case 66: r = kernel_tex_image_interp(__tex_image_byte4_066, x, y); break;
+		case 67: r = kernel_tex_image_interp(__tex_image_byte4_067, x, y); break;
+		case 68: r = kernel_tex_image_interp(__tex_image_byte4_068, x, y); break;
+		case 69: r = kernel_tex_image_interp(__tex_image_byte4_069, x, y); break;
+		case 70: r = kernel_tex_image_interp(__tex_image_byte4_070, x, y); break;
+		case 71: r = kernel_tex_image_interp(__tex_image_byte4_071, x, y); break;
+		case 72: r = kernel_tex_image_interp(__tex_image_byte4_072, x, y); break;
+		case 73: r = kernel_tex_image_interp(__tex_image_byte4_073, x, y); break;
+		case 74: r = kernel_tex_image_interp(__tex_image_byte4_074, x, y); break;
+		case 75: r = kernel_tex_image_interp(__tex_image_byte4_075, x, y); break;
+		case 76: r = kernel_tex_image_interp(__tex_image_byte4_076, x, y); break;
+		case 77: r = kernel_tex_image_interp(__tex_image_byte4_077, x, y); break;
+		case 78: r = kernel_tex_image_interp(__tex_image_byte4_078, x, y); break;
+		case 79: r = kernel_tex_image_interp(__tex_image_byte4_079, x, y); break;
+		case 80: r = kernel_tex_image_interp(__tex_image_byte4_080, x, y); break;
+		case 81: r = kernel_tex_image_interp(__tex_image_byte4_081, x, y); break;
+		case 82: r = kernel_tex_image_interp(__tex_image_byte4_082, x, y); break;
+		case 83: r = kernel_tex_image_interp(__tex_image_byte4_083, x, y); break;
+		case 84: r = kernel_tex_image_interp(__tex_image_byte4_084, x, y); break;
+		case 85: r = kernel_tex_image_interp(__tex_image_byte4_085, x, y); break;
+		case 86: r = kernel_tex_image_interp(__tex_image_byte4_086, x, y); break;
+		case 87: r = kernel_tex_image_interp(__tex_image_byte4_087, x, y); break;
+		case 88: r = kernel_tex_image_interp(__tex_image_byte4_088, x, y); break;
+		case 89: r = kernel_tex_image_interp(__tex_image_byte4_089, x, y); break;
+		case 90: r = kernel_tex_image_interp(__tex_image_byte4_090, x, y); break;
+		case 91: r = kernel_tex_image_interp(__tex_image_byte4_091, x, y); break;
+		case 92: r = kernel_tex_image_interp(__tex_image_byte4_092, x, y); break;
 
 #  if defined(__CUDA_ARCH__) && (__CUDA_ARCH__ >= 300)
-		case 93: r = kernel_tex_image_interp(__tex_image_byte_093, x, y); break;
-		case 94: r = kernel_tex_image_interp(__tex_image_byte_094, x, y); break;
-		case 95: r = kernel_tex_image_interp(__tex_image_byte_095, x, y); break;
-		case 96: r = kernel_tex_image_interp(__tex_image_byte_096, x, y); break;
-		case 97: r = kernel_tex_image_interp(__tex_image_byte_097, x, y); break;
-		case 98: r = kernel_tex_image_interp(__tex_image_byte_098, x, y); break;
-		case 99: r = kernel_tex_image_interp(__tex_image_byte_099, x, y); break;
-		case 100: r = kernel_tex_image_interp(__tex_image_byte_100, x, y); break;
-		case 101: r = kernel_tex_image_interp(__tex_image_byte_101, x, y); break;
-		case 102: r = kernel_tex_image_interp(__tex_image_byte_102, x, y); break;
-		case 103: r = kernel_tex_image_interp(__tex_image_byte_103, x, y); break;
-		case 104: r = kernel_tex_image_interp(__tex_image_byte_104, x, y); break;
-		case 105: r = kernel_tex_image_interp(__tex_image_byte_105, x, y); break;
-		case 106: r = kernel_tex_image_interp(__tex_image_byte_106, x, y); break;
-		case 107: r = kernel_tex_image_interp(__tex_image_byte_107, x, y); break;
-		case 108: r = kernel_tex_image_interp(__tex_image_byte_108, x, y); break;
-		case 109: r = kernel_tex_image_interp(__tex_image_byte_109, x, y); break;
-		case 110: r = kernel_tex_image_interp(__tex_image_byte_110, x, y); break;
-		case 111: r = kernel_tex_image_interp(__tex_image_byte_111, x, y); break;
-		case 112: r = kernel_tex_image_interp(__tex_image_byte_112, x, y); break;
-		case 113: r = kernel_tex_image_interp(__tex_image_byte_113, x, y); break;
-		case 114: r = kernel_tex_image_interp(__tex_image_byte_114, x, y); break;
-		case 115: r = kernel_tex_image_interp(__tex_image_byte_115, x, y); break;
-		case 116: r = kernel_tex_image_interp(__tex_image_byte_116, x, y); break;
-		case 117: r = kernel_tex_image_interp(__tex_image_byte_117, x, y); break;
-		case 118: r = kernel_tex_image_interp(__tex_image_byte_118, x, y); break;
-		case 119: r = kernel_tex_image_interp(__tex_image_byte_119, x, y); break;
-		case 120: r = kernel_tex_image_interp(__tex_image_byte_120, x, y); break;
-		case 121: r = kernel_tex_image_interp(__tex_image_byte_121, x, y); break;
-		case 122: r = kernel_tex_image_interp(__tex_image_byte_122, x, y); break;
-		case 123: r = kernel_tex_image_interp(__tex_image_byte_123, x, y); break;
-		case 124: r = kernel_tex_image_interp(__tex_image_byte_124, x, y); break;
-		case 125: r = kernel_tex_image_interp(__tex_image_byte_125, x, y); break;
-		case 126: r = kernel_tex_image_interp(__tex_image_byte_126, x, y); break;
-		case 127: r = kernel_tex_image_interp(__tex_image_byte_127, x, y); break;
-		case 128: r = kernel_tex_image_interp(__tex_image_byte_128, x, y); break;
-		case 129: r = kernel_tex_image_interp(__tex_image_byte_129, x, y); break;
-		case 130: r = kernel_tex_image_interp(__tex_image_byte_130, x, y); break;
-		case 131: r = kernel_tex_image_interp(__tex_image_byte_131, x, y); break;
-		case 132: r = kernel_tex_image_interp(__tex_image_byte_132, x, y); break;
-		case 133: r = kernel_tex_image_interp(__tex_image_byte_133, x, y); break;
-		case 134: r = kernel_tex_image_interp(__tex_image_byte_134, x, y); break;
-		case 135: r = kernel_tex_image_interp(__tex_image_byte_135, x, y); break;
-		case 136: r = kernel_tex_image_interp(__tex_image_byte_136, x, y); break;
-		case 137: r = kernel_tex_image_interp(__tex_image_byte_137, x, y); break;
-		case 138: r = kernel_tex_image_interp(__tex_image_byte_138, x, y); break;
-		case 139: r = kernel_tex_image_interp(__tex_image_byte_139, x, y); break;
-		case 140: r = kernel_tex_image_interp(__tex_image_byte_140, x, y); break;
-		case 141: r = kernel_tex_image_interp(__tex_image_byte_141, x, y); break;
-		case 142: r = kernel_tex_image_interp(__tex_image_byte_142, x, y); break;
-		case 143: r = kernel_tex_image_interp(__tex_image_byte_143, x, y); break;
-		case 144: r = kernel_tex_image_interp(__tex_image_byte_144, x, y); break;
-		case 145: r = kernel_tex_image_interp(__tex_image_byte_145, x, y); break;
-		case 146: r = kernel_tex_image_interp(__tex_image_byte_146, x, y); break;
-		case 147: r = kernel_tex_image_interp(__tex_image_byte_147, x, y); break;
-		case 148: r = kernel_tex_image_interp(__tex_image_byte_148, x, y); break;
-		case 149: r = kernel_tex_image_interp(__tex_image_byte_149, x, y); break;
-		case 150: r = kernel_tex_image_interp(__tex_image_byte_150, x, y); break;
+		case 93: r = kernel_tex_image_interp(__tex_image_byte4_093, x, y); break;
+		case 94: r = kernel_tex_image_interp(__tex_image_byte4_094, x, y); break;
+		case 95: r = kernel_tex_image_interp(__tex_image_byte4_095, x, y); break;
+		case 96: r = kernel_tex_image_interp(__tex_image_byte4_096, x, y); break;
+		case 97: r = kernel_tex_image_interp(__tex_image_byte4_097, x, y); break;
+		case 98: r = kernel_tex_image_interp(__tex_image_byte4_098, x, y); break;
+		case 99: r = kernel_tex_image_interp(__tex_image_byte4_099, x, y); break;
+		case 100: r = kernel_tex_image_interp(__tex_image_byte4_100, x, y); break;
+		case 101: r = kernel_tex_image_interp(__tex_image_byte4_101, x, y); break;
+		case 102: r = kernel_tex_image_interp(__tex_image_byte4_102, x, y); break;
+		case 103: r = kernel_tex_image_interp(__tex_image_byte4_103, x, y); break;
+		case 104: r = kernel_tex_image_interp(__tex_image_byte4_104, x, y); break;
+		case 105: r = kernel_tex_image_interp(__tex_image_byte4_105, x, y); break;
+		case 106: r = kernel_tex_image_interp(__tex_image_byte4_106, x, y); break;
+		case 107: r = kernel_tex_image_interp(__tex_image_byte4_107, x, y); break;
+		case 108: r = kernel_tex_image_interp(__tex_image_byte4_108, x, y); break;
+		case 109: r = kernel_tex_image_interp(__tex_image_byte4_109, x, y); break;
+		case 110: r = kernel_tex_image_interp(__tex_image_byte4_110, x, y); break;
+		case 111: r = kernel_tex_image_interp(__tex_image_byte4_111, x, y); break;
+		case 112: r = kernel_tex_image_interp(__tex_image_byte4_112, x, y); break;
+		case 113: r = kernel_tex_image_interp(__tex_image_byte4_113, x, y); break;
+		case 114: r = kernel_tex_image_interp(__tex_image_byte4_114, x, y); break;
+		case 115: r = kernel_tex_image_interp(__tex_image_byte4_115, x, y); break;
+		case 116: r = kernel_tex_image_interp(__tex_image_byte4_116, x, y); break;
+		case 117: r = kernel_tex_image_interp(__tex_image_byte4_117, x, y); break;
+		case 118: r = kernel_tex_image_interp(__tex_image_byte4_118, x, y); break;
+		case 119: r = kernel_tex_image_interp(__tex_image_byte4_119, x, y); break;
+		case 120: r = kernel_tex_image_interp(__tex_image_byte4_120, x, y); break;
+		case 121: r = kernel_tex_image_interp(__tex_image_byte4_121, x, y); break;
+		case 122: r = kernel_tex_image_interp(__tex_image_byte4_122, x, y); break;
+		case 123: r = kernel_tex_image_interp(__tex_image_byte4_123, x, y); break;
+		case 124: r = kernel_tex_image_interp(__tex_image_byte4_124, x, y); break;
+		case 125: r = kernel_tex_image_interp(__tex_image_byte4_125, x, y); break;
+		case 126: r = kernel_tex_image_interp(__tex_image_byte4_126, x, y); break;
+		case 127: r = kernel_tex_image_interp(__tex_image_byte4_127, x, y); break;
+		case 128: r = kernel_tex_image_interp(__tex_image_byte4_128, x, y); break;
+		case 129: r = kernel_tex_image_interp(__tex_image_byte4_129, x, y); break;
+		case 130: r = kernel_tex_image_interp(__tex_image_byte4_130, x, y); break;
+		case 131: r = kernel_tex_image_interp(__tex_image_byte4_131, x, y); break;
+		case 132: r = kernel_tex_image_interp(__tex_image_byte4_132, x, y); break;
+		case 133: r = kernel_tex_image_interp(__tex_image_byte4_133, x, y); break;
+		case 134: r = kernel_tex_image_interp(__tex_image_byte4_134, x, y); break;
+		case 135: r = kernel_tex_image_interp(__tex_image_byte4_135, x, y); break;
+		case 136: r = kernel_tex_image_interp(__tex_image_byte4_136, x, y); break;
+		case 137: r = kernel_tex_image_interp(__tex_image_byte4_137, x, y); break;
+		case 138: r = kernel_tex_image_interp(__tex_image_byte4_138, x, y); break;
+		case 139: r = kernel_tex_image_interp(__tex_image_byte4_139, x, y); break;
+		case 140: r = kernel_tex_image_interp(__tex_image_byte4_140, x, y); break;
+		case 141: r = kernel_tex_image_interp(__tex_image_byte4_141, x, y); break;
+		case 142: r = kernel_tex_image_interp(__tex_image_byte4_142, x, y); break;
+		case 143: r = kernel_tex_image_interp(__tex_image_byte4_143, x, y); break;
+		case 144: r = kernel_tex_image_interp(__tex_image_byte4_144, x, y); break;
+		case 145: r = kernel_tex_image_interp(__tex_image_byte4_145, x, y); break;
+		case 146: r = kernel_tex_image_interp(__tex_image_byte4_146, x, y); break;
+		case 147: r = kernel_tex_image_interp(__tex_image_byte4_147, x, y); break;
+		case 148: r = kernel_tex_image_interp(__tex_image_byte4_148, x, y); break;
+		case 149: r = kernel_tex_image_interp(__tex_image_byte4_149, x, y); break;
+		case 150: r = kernel_tex_image_interp(__tex_image_byte4_150, x, y); break;
 #  endif
 
 		default:
diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp
index 218779e2978..4a1b06ed438 100644
--- a/intern/cycles/render/image.cpp
+++ b/intern/cycles/render/image.cpp
@@ -41,33 +41,33 @@ ImageManager::ImageManager(const DeviceInfo& info)
 
 	/* CPU */
 	if(info.type == DEVICE_CPU) {
-		tex_num_images[IMAGE_DATA_TYPE_BYTE4] = TEX_NUM_BYTE_IMAGES_CPU;
+		tex_num_images[IMAGE_DATA_TYPE_BYTE4] = TEX_NUM_BYTE4_IMAGES_CPU;
 		tex_num_images[IMAGE_DATA_TYPE_FLOAT4] = TEX_NUM_FLOAT4_IMAGES_CPU;
-		tex_image_byte_start = TEX_IMAGE_BYTE_START_CPU;
+		tex_image_byte4_start = TEX_IMAGE_BYTE4_START_CPU;
 	}
 	/* CUDA (Fermi) */
 	else if((info.type == DEVICE_CUDA || info.type == DEVICE_MULTI) && !info.extended_images) {
-		tex_num_images[IMAGE_DATA_TYPE_BYTE4] = TEX_NUM_BYTE_IMAGES_CUDA;
+		tex_num_images[IMAGE_DATA_TYPE_BYTE4] = TEX_NUM_BYTE4_IMAGES_CUDA;
 		tex_num_images[IMAGE_DATA_TYPE_FLOAT4] = TEX_NUM_FLOAT4_IMAGES_CUDA;
-		tex_image_byte_start = TEX_IMAGE_BYTE_START_CUDA;
+		tex_image_byte4_start = TEX_IMAGE_BYTE4_START_CUDA;
 	}
 	/* CUDA (Kepler and above) */
 	else if((info.type == DEVICE_CUDA || info.type == DEVICE_MULTI) && info.extended_images) {
-		tex_num_images[IMAGE_DATA_TYPE_BYTE4] = TEX_NUM_BYTE_IMAGES_CUDA_KEPLER;
+		tex_num_images[IMAGE_DATA_TYPE_BYTE4] = TEX_NUM_BYTE4_IMAGES_CUDA_KEPLER;
 		tex_num_images[IMAGE_DATA_TYPE_FLOAT4] = TEX_NUM_FLOAT4_IMAGES_CUDA_KEPLER;
-		tex_image_byte_start = TEX_IMAGE_BYTE_START_CUDA_KELPER;
+		tex_image_byte4_start = TEX_IMAGE_BYTE4_START_CUDA_KELPER;
 	}
 	/* OpenCL */
 	else if(info.pack_images) {
-		tex_num_images[IMAGE_DATA_TYPE_BYTE4] = TEX_NUM_BYTE_IMAGES_OPENCL;
+		tex_num_images[IMAGE_DATA_TYPE_BYTE4] = TEX_NUM_BYTE4_IMAGES_OPENCL;
 		tex_num_images[IMAGE_DATA_TYPE_FLOAT4] = TEX_NUM_FLOAT4_IMAGES_OPENCL;
-		tex_image_byte_start = TEX_IMAGE_BYTE_START_OPENCL;
+		tex_image_byte4_start = TEX_IMAGE_BYTE4_START_OPENCL;
 	}
 	/* Should never happen */
 	else {
 		tex_num_images[IMAGE_DATA_TYPE_BYTE4] = 0;
 		tex_num_images[IMAGE_DATA_TYPE_FLOAT4] = 0;
-		tex_image_byte_start = 0;
+		tex_image_byte4_start = 0;
 		assert(0);
 	}
 }
@@ -172,16 +172,16 @@ bool ImageManager::is_float_image(const string& filename, void *builtin_data, bo
 int ImageManager::type_index_to_flattened_slot(int slot, ImageDataType type)
 {
 	if(type == IMAGE_DATA_TYPE_BYTE4)
-		return slot + tex_image_byte_start;
+		return slot + tex_image_byte4_start;
 	else
 		return slot;
 }
 
 int ImageManager::flattened_slot_to_type_index(int flat_slot, ImageDataType *type)
 {
-	if(flat_slot >= tex_image_byte_start) {
+	if(flat_slot >= tex_image_byte4_start) {
 		*type = IMAGE_DATA_TYPE_BYTE4;
-		return flat_slot - tex_image_byte_start;
+		return flat_slot - tex_image_byte4_start;
 	}
 	else {
 		*type = IMAGE_DATA_TYPE_FLOAT4;
@@ -669,7 +669,7 @@ void ImageManager::device_load_image(Device *device, DeviceScene *dscene, ImageD
 		}
 	}
 	else {
-		device_vector<uchar4>& tex_img = dscene->tex_byte_image[slot];
+		device_vector<uchar4>& tex_img = dscene->tex_byte4_image[slot];
 
 		if(tex_img.device_pointer) {
 			thread_scoped_lock device_lock(device_mutex);
@@ -689,9 +689,9 @@ void ImageManager::device_load_image(Device *device, DeviceScene *dscene, ImageD
 		string name;
 
 		int flat_slot = type_index_to_flattened_slot(slot, type);
-		if(flat_slot >= 100) name = string_printf("__tex_image_byte_%d", flat_slot);
-		else if(flat_slot >= 10) name = string_printf("__tex_image_byte_0%d", flat_slot);
-		else name = string_printf("__tex_image_byte_00%d", flat_slot);
+		if(flat_slot >= 100) name = string_printf("__tex_image_byte4_%d", flat_slot);
+		else if(flat_slot >= 10) name = string_printf("__tex_image_byte4_0%d", flat_slot);
+		else name = string_printf("__tex_image_byte4_00%d", flat_slot);
 
 		if(!pack_images) {
 			thread_scoped_lock device_lock(device_mutex);
@@ -730,7 +730,7 @@ void ImageManager::device_free_image(Device *device, DeviceScene *dscene, ImageD
 			images[type][slot] = NULL;
 		}
 		else {
-			device_vector<uchar4>& tex_img = dscene->tex_byte_image[slot];
+			device_vector<uchar4>& tex_img = dscene->tex_byte4_image[slot];
 
 			if(tex_img.device_pointer) {
 				thread_scoped_lock device_lock(device_mutex);
@@ -814,7 +814,7 @@ void ImageManager::device_pack_images(Device *device,
 		if(!images[type][slot])
 			continue;
 
-		device_vector<uchar4>& tex_img = dscene->tex_byte_image[slot];
+		device_vector<uchar4>& tex_img = dscene->tex_byte4_image[slot];
 		size += tex_img.size();
 	}
 
@@ -827,7 +827,7 @@ void ImageManager::device_pack_images(Device *device,
 		if(!images[type][slot])
 			continue;
 
-		device_vector<uchar4>& tex_img = dscene->tex_byte_image[slot];
+		device_vector<uchar4>& tex_img = dscene->tex_byte4_image[slot];
 
 		/* todo: support 3D textures, only CPU for now */
 
diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h
index 24d6aaedf04..1bb9987f602 100644
--- a/intern/cycles/render/image.h
+++ b/intern/cycles/render/image.h
@@ -93,7 +93,7 @@ public:
 
 private:
 	int tex_num_images[IMAGE_DATA_NUM_TYPES];
-	int tex_image_byte_start;
+	int tex_image_byte4_start;
 	thread_mutex device_mutex;
 	int animation_frame;
 
diff --git a/intern/cycles/render/scene.h b/intern/cycles/render/scene.h
index 4f139e4d73f..b05e5a61ee9 100644
--- a/intern/cycles/render/scene.h
+++ b/intern/cycles/render/scene.h
@@ -109,7 +109,7 @@ public:
 	device_vector<uint> sobol_directions;
 
 	/* cpu images */
-	device_vector<uchar4> tex_byte_image[TEX_NUM_BYTE_IMAGES_CPU];
+	device_vector<uchar4> tex_byte4_image[TEX_NUM_BYTE4_IMAGES_CPU];
 	device_vector<float4> tex_float4_image[TEX_NUM_FLOAT4_IMAGES_CPU];
 
 	/* opencl images */
diff --git a/intern/cycles/util/util_texture.h b/intern/cycles/util/util_texture.h
index 2894a1a0b41..837858d0687 100644
--- a/intern/cycles/util/util_texture.h
+++ b/intern/cycles/util/util_texture.h
@@ -22,24 +22,24 @@ CCL_NAMESPACE_BEGIN
 /* Texture limits on various devices. */
 
 /* CPU */
-#define TEX_NUM_BYTE_IMAGES_CPU		1024
+#define TEX_NUM_BYTE4_IMAGES_CPU		1024
 #define TEX_NUM_FLOAT4_IMAGES_CPU	1024
-#define TEX_IMAGE_BYTE_START_CPU	TEX_NUM_FLOAT4_IMAGES_CPU
+#define TEX_IMAGE_BYTE4_START_CPU	TEX_NUM_FLOAT4_IMAGES_CPU
 
 /* CUDA (Fermi) */
-#define TEX_NUM_BYTE_IMAGES_CUDA	88
+#define TEX_NUM_BYTE4_IMAGES_CUDA	88
 #define TEX_NUM_FLOAT4_IMAGES_CUDA	5
-#define TEX_IMAGE_BYTE_START_CUDA	TEX_NUM_FLOAT4_IMAGES_CUDA
+#define TEX_IMAGE_BYTE4_START_CUDA	TEX_NUM_FLOAT4_IMAGES_CUDA
 
 /* CUDA (KEPLER and above) */
-#define TEX_NUM_BYTE_IMAGES_CUDA_KEPLER		145
+#define TEX_NUM_BYTE4_IMAGES_CUDA_KEPLER		145
 #define TEX_NUM_FLOAT4_IMAGES_CUDA_KEPLER	5
-#define TEX_IMAGE_BYTE_START_CUDA_KELPER	TEX_NUM_FLOAT4_IMAGES_CUDA_KEPLER
+#define TEX_IMAGE_BYTE4_START_CUDA_KELPER	TEX_NUM_FLOAT4_IMAGES_CUDA_KEPLER
 
 /* OpenCL */
-#define TEX_NUM_BYTE_IMAGES_OPENCL		1024
+#define TEX_NUM_BYTE4_IMAGES_OPENCL		1024
 #define TEX_NUM_FLOAT4_IMAGES_OPENCL		0
-#define TEX_IMAGE_BYTE_START_OPENCL		TEX_NUM_FLOAT4_IMAGES_OPENCL
+#define TEX_IMAGE_BYTE4_START_OPENCL		TEX_NUM_FLOAT4_IMAGES_OPENCL
 
 
 /* Color to use when textures are not found. */