v196: bug 14921 part 2: Expanding abbreviations for consistency (WIP)

https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14921
diff --git a/vk-layer-generate.py b/vk-layer-generate.py
index dbce97b..93319dd 100755
--- a/vk-layer-generate.py
+++ b/vk-layer-generate.py
@@ -1818,12 +1818,12 @@
             funcs.append('%s%s\n' % (qual, decl) +
                      '{\n'
                      '    for (uint32_t i=0; i<memoryRangeCount; i++) {\n'
-                     '        useObject((const void *) %s, pMemoryRanges[i].mem);\n' % proto.params[0].name +
+                     '        useObject((const void *) %s, pMemoryRanges[i].memory);\n' % proto.params[0].name +
                      '    }\n'
                      '    VkLayerDispatchTable *pDeviceTable = get_dispatch_table(Threading_%s_table_map, %s);\n' % (table, proto.params[0].name) +
                      '    %s pDeviceTable->%s;\n' % (ret_val, proto.c_call()) +
                      '    for (uint32_t i=0; i<memoryRangeCount; i++) {\n'
-                     '        finishUsingObject(pMemoryRanges[i].mem);\n'
+                     '        finishUsingObject(pMemoryRanges[i].memory);\n'
                      '    }\n'
                      '%s' % (stmt) +
                      '}')