diff --git a/ps-grammar/dictionary/tobiDic.dic b/ps-grammar/dictionary/tobiDic.dic
index 3420e5367231d88adedab1cc94cca36b35e848a2..9b9c0e2e9da85523ad93b9673f1db6ab716e8cb3 100644
--- a/ps-grammar/dictionary/tobiDic.dic
+++ b/ps-grammar/dictionary/tobiDic.dic
@@ -9716,7 +9716,6 @@ bedraggled	B IH D R AE G AH L D
 bedridden	B EH D R IH D AH N
 bedrock	B EH D R AA K
 bedroom	B EH D R UW M
-bed_room	B EH D R UW M
 bedrooms	B EH D R UW M Z
 bedrosian	B EH D R AA ZH IH N
 bedrosian(2)	B AH D R OW Z IY AH N
diff --git a/ps-grammar/gprs/gprs.jsgf b/ps-grammar/gprs/gprs.jsgf
index e9f7abaea136ced22cb2e6db366fd64dca221d6e..dc4d42f56cfb699de072ac47a08c8c655ee75455 100644
--- a/ps-grammar/gprs/gprs.jsgf
+++ b/ps-grammar/gprs/gprs.jsgf
@@ -43,7 +43,7 @@ public <task> = [tobi] [(would | could) you] [please] <command> [please] [tobi];
 <seating_class> = sofa | bed;
 <table_class> = kitchen_table | desk | side_table | couch_table | (bedroom table);
 <door_class> = (exit door) | (entry door) | (room door);
-<room_class> = kitchen | living_room | bed_room | hallway;
+<room_class> = kitchen | living_room | bedroom | hallway;
 <utensil_class> = trash_bin;
 
 <preposition> = into | to | from;
diff --git a/ps-grammar/location/location.jsgf b/ps-grammar/location/location.jsgf
index 99ca6b1c247933037ac98cf5f7f65837ea4563a1..da0f9dd949d97f7fe6d1b070694389e33953a83f 100644
--- a/ps-grammar/location/location.jsgf
+++ b/ps-grammar/location/location.jsgf
@@ -16,6 +16,6 @@ public <statement> = <locationPhrase> [please];
 <door_class> = (exit door) | (entry door) | (room door);
 <utensil_class> = trash_bin;
 
-<room_class> = kitchen | living_room | bed_room | hallway;
+<room_class> = kitchen | living_room | bedroom | hallway;
 
 <preposition> = into | (on [top of]) | in | ([next] to) | at | near | in | from;