diff --git a/runtime/libprofile/BasicBlockTracing.c b/runtime/libprofile/BasicBlockTracing.c
index 00136330212..e70dc052843 100644
--- a/runtime/libprofile/BasicBlockTracing.c
+++ b/runtime/libprofile/BasicBlockTracing.c
@@ -23,7 +23,7 @@ static unsigned *ArrayStart, *ArrayEnd, *ArrayCursor;
  * and reset the cursor to point to the beginning of the buffer.
  */
 static void WriteAndFlushBBTraceData () {
-  write_profiling_data(BBTrace, ArrayStart, (ArrayCursor - ArrayStart));
+  write_profiling_data(BBTraceInfo, ArrayStart, (ArrayCursor - ArrayStart));
   ArrayCursor = ArrayStart;
 }
 
diff --git a/runtime/libprofile/CommonProfiling.c b/runtime/libprofile/CommonProfiling.c
index aeb9c606e4e..16bd9bd4c53 100644
--- a/runtime/libprofile/CommonProfiling.c
+++ b/runtime/libprofile/CommonProfiling.c
@@ -99,7 +99,7 @@ void write_profiling_data(enum ProfilingType PT, unsigned *Start,
 
     /* Output the command line arguments to the file. */
     {
-      int PTy = Arguments;
+      int PTy = ArgumentInfo;
       int Zeros = 0;
       write(OutFile, &PTy, sizeof(int));
       write(OutFile, &SavedArgsLength, sizeof(unsigned));
diff --git a/runtime/libprofile/FunctionProfiling.c b/runtime/libprofile/FunctionProfiling.c
index 5f9c4f2e388..d030053094b 100644
--- a/runtime/libprofile/FunctionProfiling.c
+++ b/runtime/libprofile/FunctionProfiling.c
@@ -25,7 +25,7 @@ static unsigned NumElements;
 static void FuncProfAtExitHandler() {
   /* Just write out the data we collected.
    */
-  write_profiling_data(Function, ArrayStart, NumElements);
+  write_profiling_data(FunctionInfo, ArrayStart, NumElements);
 }