diff --git a/examples_cuda/aobench/ao1.ispc b/examples_cuda/aobench/ao1.ispc
index 8425fd89..032030e6 100644
--- a/examples_cuda/aobench/ao1.ispc
+++ b/examples_cuda/aobench/ao1.ispc
@@ -207,8 +207,8 @@ static  inline void ao_tile(
     uniform int nsubsamples, 
     uniform float image[]) 
 {
-  static uniform Plane plane = { { 0.0f, -0.5f, 0.0f }, { 0.f, 1.f, 0.f } };
-  static uniform Sphere spheres[3] = {
+  uniform Plane plane = { { 0.0f, -0.5f, 0.0f }, { 0.f, 1.f, 0.f } };
+  uniform Sphere spheres[3] = {
     { { -2.0f, 0.0f, -3.5f }, 0.5f },
     { { -0.5f, 0.0f, -3.0f }, 0.5f },
     { { 1.0f, 0.0f, -2.2f }, 0.5f } };
diff --git a/type.cpp b/type.cpp
index 28e8323c..b240003c 100644
--- a/type.cpp
+++ b/type.cpp
@@ -744,7 +744,7 @@ EnumType::Mangle() const {
     std::string ret;
     if (isConst) ret += "C";
     ret += variability.MangleString();
-    ret += std::string("enum[") + name + std::string("]");
+    ret += std::string("enum_5B_") + name + std::string("_5C_");
     return ret;
 }
 
@@ -2040,12 +2040,12 @@ lMangleStruct(Variability variability, bool isConst, const std::string &name) {
     Assert(variability != Variability::Unbound);
 
     std::string ret;
-    ret += "s[";
+    ret += "s_5B_";
     if (isConst)
         ret += "_c_";
     ret += variability.MangleString();
 
-    ret += name + std::string("]");
+    ret += name + std::string("_5C_");
     return ret;
 }