diff --git a/src/components/BuildingListTable/index.js b/src/components/BuildingListTable/index.js
index 71366629b302c6faa644f56ae2fca3c6f7347c90..9d1df7656c8e44a56e3a804a93b83d8996c8ee47 100644
--- a/src/components/BuildingListTable/index.js
+++ b/src/components/BuildingListTable/index.js
@@ -130,7 +130,7 @@ export default function BuildingListTable({
       );
       delete lotGrouping[building.bbl];
     }
-    const placeName = building.placeName ? building.placeName : building.street_address;
+    const placeName = building.place_name ? building.place_name : building.street_address;
     return (
       <tr
         key={`${building.building_id}${placeName}`}
diff --git a/src/components/Questionnaire/BuildingInfo.js b/src/components/Questionnaire/BuildingInfo.js
index 4d1e8bf209eb32637e29ec221a95187cd1e5056d..e4ec043e8c4e00f5180c9a637b0f1fb7ab297f4b 100644
--- a/src/components/Questionnaire/BuildingInfo.js
+++ b/src/components/Questionnaire/BuildingInfo.js
@@ -104,13 +104,7 @@ class BuildingInfo extends Component {
   }
 
   render() {
-    const address = this.props.address.map(addressItem => {
-      return (
-        <div>
-          {addressItem}
-        </div>
-      );
-    });
+    const address = this.props.address;
     return (
       <div>
         <Card style={{ padding: '0px', marginBottom: '30px' }}>
diff --git a/src/components/SideBarDetail/index.js b/src/components/SideBarDetail/index.js
index 067653d96087f37096a883704f00dabc562db893..d5c015daaa0da548405d4e0d07ccc2b49919379a 100644
--- a/src/components/SideBarDetail/index.js
+++ b/src/components/SideBarDetail/index.js
@@ -27,50 +27,17 @@ const isActive = (url) => {
 
 export default function SideBarDetail({ building, children, contacts, user }) {
   const rootURL = `/buildings/${building.building_id}`;
-  let addressString;
-  if (building.street_address !== undefined) {
-    addressString = building.street_address[0];
-  }
-  let addressListSection = (
-    <h5 className="separate">
-      {`
-        ${addressString},
-        ${building.borough},
-        ${building.zipcode}
-      `}
-    </h5>
-  );
-  if (
-    building.street_address !== undefined &&
-    building.street_address.length > 1
-  ) {
-    const addressListString = building.street_address.map(val => (
-      <tr key={val}>
-        <th>{val}</th>
-      </tr>
-    ));
+  let addressListSection;
+  if (building.place_name !== undefined && building.place_name.length > 0) {
     addressListSection = (
       <div className="info">
         <div className="separate">
-          <h5>Borough: {building.borough}</h5>
-          <h5>Zipcode: {building.zipcode}</h5>
-          <h5 id="addressListHeader" >
-            Address List{' '}
-            <Icon name="question-circle" />
-          </h5>
-          <UncontrolledTooltip placement="right" target="addressListHeader">
-            There can be multiple addresses for a single building
-            if the building has multiple entrances
-          </UncontrolledTooltip>
-          <table className="ids">
-            <tbody>
-              {addressListString}
-            </tbody>
-          </table>
+          <h5>{building.place_name}</h5>
         </div>
       </div>
     );
   }
+
   let contactListSection = null;
   let contactCounter = 0;
   if (contacts) {
diff --git a/src/containers/BGroup/BGroupBuildingTable.js b/src/containers/BGroup/BGroupBuildingTable.js
index c5550bb8fc783d31043b8def1f563b2299f2536f..c9240a47fba0fa4b3375a07a6fe045be6e53b665 100644
--- a/src/containers/BGroup/BGroupBuildingTable.js
+++ b/src/containers/BGroup/BGroupBuildingTable.js
@@ -806,8 +806,6 @@ export default class BGroupBuildingTable extends Component {
       val.gateway_install = gatewayDates[val.building_id];
       val.building_simulation = simulationDates[val.building_id];
       val.bbl = bbls[val.building_id];
-      console.log("heatPumpScores rendering");  // eslint-disable-line
-      console.log(heatPumpScores);  // eslint-disable-line
       if (heatPumpScores[val.building_id]) {
         val.heat_pump_score = heatPumpScores[val.building_id].score;
         val.building_proximities = heatPumpScores[val.building_id].building_proximities_cost;
diff --git a/src/containers/Building/index.js b/src/containers/Building/index.js
index 62b442fcd5fe5a9c7a59d95e42cf2e2cc16b986b..9e41c984f49ae2c8c9ff132cf434991fe9d03352 100644
--- a/src/containers/Building/index.js
+++ b/src/containers/Building/index.js
@@ -61,8 +61,8 @@ class Building extends Component {
       const salesForceId = nextProps.projects.projects[0].sales_force_id;
       this.props.loadContacts(salesForceId);
     }
-    if (nextProps.overview.street_address && !this.props.overview.street_address) {
-      const documentPath = `/Buildings/${nextProps.overview.street_address} (${nextProps.overview.building_id})`;
+    if (nextProps.overview.place_name && !this.props.overview.place_name) {
+      const documentPath = `/Buildings/${nextProps.overview.place_name} (${nextProps.overview.building_id})`;
       this.props.loadBuildingFolder(
         documentPath,
         true,
@@ -76,12 +76,12 @@ class Building extends Component {
 
   updateStorage = (props) => {
     let buildingList = localStorage.activeBuildings;
-    const streetAddressString = props.overview.street_address.join(', ');
+    const place_name = props.overview.place_name;
     if (buildingList !== undefined) {
       buildingList = JSON.parse(buildingList);
       const addList = [{
         ...props.overview,
-        street_address: streetAddressString,
+        place_name,
       }];
       buildingList = buildingList.filter((val, index) => {
         // Make sure the list is smaller than 300
@@ -90,7 +90,7 @@ class Building extends Component {
         }
         const sameBuilding = (
           props.overview.building_id === val.building_id &&
-          streetAddressString === val.street_address
+          streetAddressString === val.place_name
         );
         const sameLot = (
           props.overview.bbl === val.bbl
@@ -109,7 +109,7 @@ class Building extends Component {
     } else {
       buildingList = [{
         ...props.overview,
-        street_address: streetAddressString,
+        place_name: streetAddressString,
       }];
     }
     localStorage.setItem('activeBuildings', JSON.stringify(buildingList));
@@ -117,7 +117,7 @@ class Building extends Component {
 
   render() {
     const { error, loading } = this.props.overview;
-    const streetAddress = this.props.overview.street_address;
+    const streetAddress = this.props.overview.place_name;
     let mainContent = (
       <div className="loading-svg">
         <img src={loadingSVG} alt="loading" />
@@ -128,7 +128,7 @@ class Building extends Component {
     }
     /*
       FIXME: comparison of building_id and buildingId is needed because the
-      child components have a mismatch with buildingId and street_address
+      child components have a mismatch with buildingId and place_name
     */
     if (this.props.children && !error && !loading && streetAddress !== undefined &&
       parseInt(this.props.buildingId, 10) === this.props.overview.building_id) {
diff --git a/src/containers/Questionnaire/index.js b/src/containers/Questionnaire/index.js
index fa33a2826afb4f07b14ab76a03a5507c84a4c581..bf4aa04e5f798210c55925fcffac3ed986136d06 100644
--- a/src/containers/Questionnaire/index.js
+++ b/src/containers/Questionnaire/index.js
@@ -191,9 +191,7 @@ class Questionnaire extends Component {
     if (buildingInfo.data !== undefined && buildingInfo.data !== null &&
       submittedAnswers.data !== undefined && submittedAnswers.data !== null &&
       building !== undefined) {
-      const address = building.street_address.map(addressItem => {
-        return `${addressItem}, ${building.borough}`;
-      });
+      const address = building.place_name;
 
       const tableHeader = {
         fontWeight: 'bold',
diff --git a/src/screens/HomePage/index.js b/src/screens/HomePage/index.js
index 61f156101c42684d0d19d94bb4fe07ff14cb27fb..58cc99b63bb98ca4093668a55bda638d1568a1cf 100644
--- a/src/screens/HomePage/index.js
+++ b/src/screens/HomePage/index.js
@@ -164,7 +164,7 @@ class HomePage extends Component {
           <h6>{i.bbl}</h6>
         </div>
         <ListGroupItemText className="d-flex w-100 justify-content-between">
-          <Link to={`/buildings/${i.building_id}`}>{i.street_address}</Link>
+          <Link to={`/buildings/${i.building_id}`}>{i.place_name}</Link>
         </ListGroupItemText>
       </ListGroupItem>
     ));