Rename EmittedFuncEntry -> EmittedFuncInfo.
diff --git a/lib/bcc/CodeEmitter.cpp b/lib/bcc/CodeEmitter.cpp
index 559cc20..78b7bd6 100644
--- a/lib/bcc/CodeEmitter.cpp
+++ b/lib/bcc/CodeEmitter.cpp
@@ -17,7 +17,7 @@
 #include "CodeEmitter.h"
 
 #include "CodeMemoryManager.h"
-#include "EmittedFuncEntry.h"
+#include "EmittedFuncInfo.h"
 #include "Runtime.h"
 
 #include <bcc/bcc.h>
@@ -1274,7 +1274,7 @@
   BufferEnd = BufferBegin + ActualSize;
 
   if (mpCurEmitFunction == NULL)
-    mpCurEmitFunction = new EmittedFuncEntry();
+    mpCurEmitFunction = new EmittedFuncInfo();
   mpCurEmitFunction->FunctionBody = BufferBegin;
 
   // Ensure the constant pool/jump table info is at least 4-byte aligned.
diff --git a/lib/bcc/CodeEmitter.h b/lib/bcc/CodeEmitter.h
index 6cb0a07..2aeeef2 100644
--- a/lib/bcc/CodeEmitter.h
+++ b/lib/bcc/CodeEmitter.h
@@ -60,14 +60,14 @@
 
 namespace bcc {
   class CodeMemoryManager;
-  class EmittedFuncEntry;
+  class EmittedFuncInfo;
 
   class CodeEmitter : public llvm::JITCodeEmitter {
   private:
     typedef llvm::DenseMap<const llvm::GlobalValue *, void *>
       GlobalAddressMapTy;
 
-    typedef std::map<const std::string, EmittedFuncEntry *>
+    typedef std::map<const std::string, EmittedFuncInfo *>
       EmittedFunctionsMapTy;
 
     typedef llvm::DenseMap<const llvm::Function *, void*>
@@ -91,7 +91,7 @@
     const llvm::TargetData *mpTD;
 
 
-    EmittedFuncEntry *mpCurEmitFunction;
+    EmittedFuncInfo *mpCurEmitFunction;
 
     EmittedFunctionsMapTy mEmittedFunctions;
 
diff --git a/lib/bcc/EmittedFuncEntry.h b/lib/bcc/EmittedFuncInfo.h
similarity index 83%
rename from lib/bcc/EmittedFuncEntry.h
rename to lib/bcc/EmittedFuncInfo.h
index 798c354..b0fdb06 100644
--- a/lib/bcc/EmittedFuncEntry.h
+++ b/lib/bcc/EmittedFuncInfo.h
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-#ifndef BCC_EMITTEDFUNCENTRY_H
-#define BCC_EMITTEDFUNCENTRY_H
+#ifndef BCC_EMITTEDFUNCINFO_H
+#define BCC_EMITTEDFUNCINFO_H
 
 #include <stddef.h>
 
 namespace bcc {
 
-  class EmittedFuncEntry {
+  class EmittedFuncInfo {
   public:
     // Beginning of the function's allocation.
     void *FunctionBody;
@@ -32,11 +32,11 @@
     // The size of the function code
     int Size;
 
-    EmittedFuncEntry() : FunctionBody(NULL), Code(NULL) {
+    EmittedFuncInfo() : FunctionBody(NULL), Code(NULL) {
     }
 
   };
 
 } // namespace bcc
 
-#endif // BCC_EMITTEDFUNCENTRY_H
+#endif // BCC_EMITTEDFUNCINFO_H