--- a/devtools/client/memory/components/Toolbar.js
+++ b/devtools/client/memory/components/Toolbar.js
@@ -9,44 +9,34 @@ const PropTypes = require("devtools/clie
 const dom = require("devtools/client/shared/vendor/react-dom-factories");
 const { L10N } = require("../utils");
 const models = require("../models");
 const { viewState } = require("../constants");
 
 class Toolbar extends Component {
   static get propTypes() {
     return {
-      censusDisplays: PropTypes.arrayOf(PropTypes.shape({
-        displayName: PropTypes.string.isRequired,
-      })).isRequired,
-      censusDisplay: PropTypes.shape({
-        displayName: PropTypes.string.isRequired,
-      }).isRequired,
+      censusDisplays: PropTypes.arrayOf(models.censusDisplay).isRequired,
+      censusDisplay: models.censusDisplay,
       onTakeSnapshotClick: PropTypes.func.isRequired,
       onImportClick: PropTypes.func.isRequired,
       onClearSnapshotsClick: PropTypes.func.isRequired,
       onCensusDisplayChange: PropTypes.func.isRequired,
       onToggleRecordAllocationStacks: PropTypes.func.isRequired,
       allocations: models.allocations,
       filterString: PropTypes.string,
       setFilterString: PropTypes.func.isRequired,
       diffing: models.diffingModel,
       onToggleDiffing: PropTypes.func.isRequired,
       view: models.view.isRequired,
       onViewChange: PropTypes.func.isRequired,
-      labelDisplays: PropTypes.arrayOf(PropTypes.shape({
-        displayName: PropTypes.string.isRequired,
-      })).isRequired,
-      labelDisplay: PropTypes.shape({
-        displayName: PropTypes.string.isRequired,
-      }).isRequired,
+      labelDisplays: PropTypes.arrayOf(models.labelDisplay).isRequired,
+      labelDisplay: models.labelDisplay,
       onLabelDisplayChange: PropTypes.func.isRequired,
-      treeMapDisplays: PropTypes.arrayOf(PropTypes.shape({
-        displayName: PropTypes.string.isRequired,
-      })).isRequired,
+      treeMapDisplays: PropTypes.arrayOf(models.treeMapDisplay).isRequired,
       onTreeMapDisplayChange: PropTypes.func.isRequired,
       snapshots: PropTypes.arrayOf(models.snapshot).isRequired,
     };
   }
 
   render() {
     let {
       onTakeSnapshotClick,