A whole bunch of cleanup

www/floorplan/fullsized_floorplan.svg

@@ -1429,12 +1429,12 @@
    inkscape:label="binary_sensor.front_door_contact" />
 <rect
    style="display:inline;fill:#a21a28;fill-opacity:1;stroke-width:0.856577"
-   id="binary_sensor.inner_garage_door"
+   id="binary_sensor.inner_garage_door_contact"
    width="2"
    height="32"
    x="303.41666"
    y="-17684.5"
-   inkscape:label="binary_sensor.inner_garage_door" />
+   inkscape:label="binary_sensor.inner_garage_door_contact" />
 <rect
    id="binary_sensor.mancave_door_contact"
    width="28.25"
@@ -1619,14 +1619,14 @@
    style="stroke-width:0.012145"
    transform="scale(-1)" />
 <rect
-   id="binary_sensor.furnace_room_door"
+   id="binary_sensor.furnace_room_door_contact"
    width="28.25"
    height="1.25"
    x="-719.29169"
    y="17456.875"
    style="fill:#a05a2c;stroke:#a05a2c;stroke-width:0.00515836"
    transform="scale(-1)"
-   inkscape:label="binary_sensor.furnace_room_door" />
+   inkscape:label="binary_sensor.furnace_room_door_contact" />
 <rect
    id="rect12-8-8-9-3-20-4-5-2"
    width="68.25"
@@ -1961,12 +1961,12 @@
    inkscape:label="input_boolean.front_porch_occupied" />
 <rect
    style="display:inline;fill:#a21a28;fill-opacity:1;stroke-width:0.856577"
-   id="binary_sensor.outer_garage_door"
+   id="binary_sensor.outer_garage_door_contact"
    width="2"
    height="32"
    x="303.41666"
    y="-17774.25"
-   inkscape:label="binary_sensor.outer_garage_door" />
+   inkscape:label="binary_sensor.outer_garage_door_contact" />
 <rect
    style="fill:#aa0000;fill-opacity:1;stroke-width:0.0134631"
    id="input_boolean.deck_occupied"