diff --git a/include/cef.h b/include/cef.h
index 2cd196b8f..1bc98f2d5 100644
--- a/include/cef.h
+++ b/include/cef.h
@@ -1079,7 +1079,7 @@ public:
   // Returns the globally unique identifier for this frame.
   ///
   /*--cef()--*/
-  virtual long long GetIdentifier() =0;
+  virtual int64 GetIdentifier() =0;
 
   ///
   // Returns the parent of this frame or NULL if this is the main (top-level)
diff --git a/include/cef_capi.h b/include/cef_capi.h
index e0eea65e5..46b6bef99 100644
--- a/include/cef_capi.h
+++ b/include/cef_capi.h
@@ -914,7 +914,7 @@ typedef struct _cef_frame_t
   ///
   // Returns the globally unique identifier for this frame.
   ///
-  long long (CEF_CALLBACK *get_identifier)(struct _cef_frame_t* self);
+  int64 (CEF_CALLBACK *get_identifier)(struct _cef_frame_t* self);
 
   ///
   // Returns the parent of this frame or NULL if this is the main (top-level)
diff --git a/libcef/browser_impl.cc b/libcef/browser_impl.cc
index fa804c940..cd748d2d0 100644
--- a/libcef/browser_impl.cc
+++ b/libcef/browser_impl.cc
@@ -1582,8 +1582,8 @@ CefFrameImpl::CefFrameImpl(CefBrowserImpl* browser,
                            const CefString& name,
                            const CefString& url)
     : browser_(browser),
-      id_(id),
       name_(name),
+      id_(id),
       url_(url) {
 }
 
diff --git a/libcef_dll/cpptoc/frame_cpptoc.cc b/libcef_dll/cpptoc/frame_cpptoc.cc
index 657ab9b8d..b10076e0a 100644
--- a/libcef_dll/cpptoc/frame_cpptoc.cc
+++ b/libcef_dll/cpptoc/frame_cpptoc.cc
@@ -325,7 +325,7 @@ cef_string_userfree_t CEF_CALLBACK frame_get_name(struct _cef_frame_t* self)
 }
 
 
-long long CEF_CALLBACK frame_get_identifier(struct _cef_frame_t* self)
+int64 CEF_CALLBACK frame_get_identifier(struct _cef_frame_t* self)
 {
   // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
 
@@ -334,7 +334,7 @@ long long CEF_CALLBACK frame_get_identifier(struct _cef_frame_t* self)
     return 0;
 
   // Execute
-  long long _retval = CefFrameCppToC::Get(self)->GetIdentifier();
+  int64 _retval = CefFrameCppToC::Get(self)->GetIdentifier();
 
   // Return type: simple
   return _retval;
diff --git a/libcef_dll/ctocpp/frame_ctocpp.cc b/libcef_dll/ctocpp/frame_ctocpp.cc
index 86ce121a8..bbe22aaec 100644
--- a/libcef_dll/ctocpp/frame_ctocpp.cc
+++ b/libcef_dll/ctocpp/frame_ctocpp.cc
@@ -314,7 +314,7 @@ CefString CefFrameCToCpp::GetName()
 }
 
 
-long long CefFrameCToCpp::GetIdentifier()
+int64 CefFrameCToCpp::GetIdentifier()
 {
   if (CEF_MEMBER_MISSING(struct_, get_identifier))
     return 0;
@@ -322,7 +322,7 @@ long long CefFrameCToCpp::GetIdentifier()
   // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
 
   // Execute
-  long long _retval = struct_->get_identifier(struct_);
+  int64 _retval = struct_->get_identifier(struct_);
 
   // Return type: simple
   return _retval;
diff --git a/libcef_dll/ctocpp/frame_ctocpp.h b/libcef_dll/ctocpp/frame_ctocpp.h
index 8a12a4a57..49be26e50 100644
--- a/libcef_dll/ctocpp/frame_ctocpp.h
+++ b/libcef_dll/ctocpp/frame_ctocpp.h
@@ -54,7 +54,7 @@ public:
   virtual bool IsMain() OVERRIDE;
   virtual bool IsFocused() OVERRIDE;
   virtual CefString GetName() OVERRIDE;
-  virtual long long GetIdentifier() OVERRIDE;
+  virtual int64 GetIdentifier() OVERRIDE;
   virtual CefRefPtr<CefFrame> GetParent() OVERRIDE;
   virtual CefString GetURL() OVERRIDE;
   virtual CefRefPtr<CefBrowser> GetBrowser() OVERRIDE;