diff --git a/src/envoy/mixer/http_control.cc b/src/envoy/mixer/http_control.cc
index 76b4dfa06f..3b97d20a35 100644
--- a/src/envoy/mixer/http_control.cc
+++ b/src/envoy/mixer/http_control.cc
@@ -31,19 +31,7 @@ namespace Mixer {
 namespace {
 
 // Define attribute names
-const std::string kAttrNameRequestSize = "request.size";
-const std::string kAttrNameResponseSize = "response.size";
-const std::string kAttrNameResponseTime = "response.time";
-const std::string kAttrNameOriginIp = "origin.ip";
-const std::string kAttrNameOriginHost = "origin.host";
-const std::string kResponseHttpCode = "response.http.code";
-
-Attributes::Value StringValue(const std::string& str) {
-  Attributes::Value v;
-  v.type = Attributes::Value::STRING;
-  v.str_v = str;
-  return v;
-}
+const std::string kOriginUser = "origin.user";
 
 const std::string kRequestHeaders = "request.headers";
 const std::string kRequestHost = "request.host";
@@ -113,9 +101,10 @@ void FillRequestInfoAttributes(const AccessLog::RequestInfo& info,
 
   if (info.responseCode().valid()) {
     attr->attributes[kResponseHttpCode] =
-        Int64Value(info.responseCode().value());
+        Attributes::Int64Value(info.responseCode().value());
   } else {
-    attr->attributes[kResponseHttpCode] = Int64Value(check_status_code);
+    attr->attributes[kResponseHttpCode] =
+        Attributes::Int64Value(check_status_code);
   }
 }