diff --git a/src/bin/dhcp4/dhcp4_parser.cc b/src/bin/dhcp4/dhcp4_parser.cc
index 983d283fb8..2187176eac 100644
--- a/src/bin/dhcp4/dhcp4_parser.cc
+++ b/src/bin/dhcp4/dhcp4_parser.cc
@@ -4127,7 +4127,7 @@ namespace isc { namespace dhcp {
 #line 2609 "dhcp4_parser.yy"
                                                {
     ctx.unique("socket-port", ctx.loc2pos(yystack_[2].location));
-    ElementPtr port(new StringElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr port(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("socket-port", port);
 }
 #line 4134 "dhcp4_parser.cc"
@@ -4202,7 +4202,7 @@ namespace isc { namespace dhcp {
 #line 2663 "dhcp4_parser.yy"
              {
     ctx.unique("realm", ctx.loc2pos(yystack_[0].location));
-    ctx.enter(ctx.NO_KEYWORDS);
+    ctx.enter(ctx.NO_KEYWORD);
 }
 #line 4208 "dhcp4_parser.cc"
     break;
@@ -4221,7 +4221,7 @@ namespace isc { namespace dhcp {
 #line 2672 "dhcp4_parser.yy"
                      {
     ctx.unique("directory", ctx.loc2pos(yystack_[0].location));
-    ctx.enter(ctx.NO_KEYWORDS);
+    ctx.enter(ctx.NO_KEYWORD);
 }
 #line 4227 "dhcp4_parser.cc"
     break;
@@ -4295,7 +4295,7 @@ namespace isc { namespace dhcp {
 #line 2727 "dhcp4_parser.yy"
                      {
     ctx.unique("user-file", ctx.loc2pos(yystack_[0].location));
-    ctx.enter(ctx.NO_KEYWORDS);
+    ctx.enter(ctx.NO_KEYWORD);
 }
 #line 4301 "dhcp4_parser.cc"
     break;
@@ -4314,7 +4314,7 @@ namespace isc { namespace dhcp {
 #line 2736 "dhcp4_parser.yy"
                              {
     ctx.unique("password-file", ctx.loc2pos(yystack_[0].location));
-    ctx.enter(ctx.NO_KEYWORDS);
+    ctx.enter(ctx.NO_KEYWORD);
 }
 #line 4320 "dhcp4_parser.cc"
     break;
diff --git a/src/bin/dhcp4/dhcp4_parser.yy b/src/bin/dhcp4/dhcp4_parser.yy
index b0190d83de..17eaf2add8 100644
--- a/src/bin/dhcp4/dhcp4_parser.yy
+++ b/src/bin/dhcp4/dhcp4_parser.yy
@@ -2608,7 +2608,7 @@ control_socket_address: SOCKET_ADDRESS {
 
 control_socket_port: SOCKET_PORT COLON INTEGER {
     ctx.unique("socket-port", ctx.loc2pos(@1));
-    ElementPtr port(new StringElement($3, ctx.loc2pos(@3)));
+    ElementPtr port(new IntElement($3, ctx.loc2pos(@3)));
     ctx.stack_.back()->set("socket-port", port);
 };
 
@@ -2662,7 +2662,7 @@ auth_type_value: BASIC { $$ = ElementPtr(new StringElement("basic", ctx.loc2pos(
 
 realm: REALM {
     ctx.unique("realm", ctx.loc2pos(@1));
-    ctx.enter(ctx.NO_KEYWORDS);
+    ctx.enter(ctx.NO_KEYWORD);
 } COLON STRING {
     ElementPtr realm(new StringElement($4, ctx.loc2pos(@4)));
     ctx.stack_.back()->set("realm", realm);
@@ -2671,7 +2671,7 @@ realm: REALM {
 
 directory: DIRECTORY {
     ctx.unique("directory", ctx.loc2pos(@1));
-    ctx.enter(ctx.NO_KEYWORDS);
+    ctx.enter(ctx.NO_KEYWORD);
 } COLON STRING {
     ElementPtr directory(new StringElement($4, ctx.loc2pos(@4)));
     ctx.stack_.back()->set("directory", directory);
@@ -2726,7 +2726,7 @@ clients_param: user
 
 user_file: USER_FILE {
     ctx.unique("user-file", ctx.loc2pos(@1));
-    ctx.enter(ctx.NO_KEYWORDS);
+    ctx.enter(ctx.NO_KEYWORD);
 } COLON STRING {
     ElementPtr user(new StringElement($4, ctx.loc2pos(@4)));
     ctx.stack_.back()->set("user-file", user);
@@ -2735,7 +2735,7 @@ user_file: USER_FILE {
 
 password_file: PASSWORD_FILE {
     ctx.unique("password-file", ctx.loc2pos(@1));
-    ctx.enter(ctx.NO_KEYWORDS);
+    ctx.enter(ctx.NO_KEYWORD);
 } COLON STRING {
     ElementPtr password(new StringElement($4, ctx.loc2pos(@4)));
     ctx.stack_.back()->set("password-file", password);