diff --git a/src/defaultProps.js b/src/defaultProps.js
index 0be55ef..cce9bc0 100644
--- a/src/defaultProps.js
+++ b/src/defaultProps.js
@@ -171,11 +171,11 @@ export default {
   rowsText: 'rows',
 
   // Components
-  TableComponent: _.makeTemplateComponent('rt-table'),
-  TheadComponent: _.makeTemplateComponent('rt-thead'),
-  TbodyComponent: _.makeTemplateComponent('rt-tbody'),
-  TrGroupComponent: _.makeTemplateComponent('rt-tr-group'),
-  TrComponent: _.makeTemplateComponent('rt-tr'),
+  TableComponent: _.makeTemplateComponent('rt-table', 'Table'),
+  TheadComponent: _.makeTemplateComponent('rt-thead', 'Thead'),
+  TbodyComponent: _.makeTemplateComponent('rt-tbody', 'Tbody'),
+  TrGroupComponent: _.makeTemplateComponent('rt-tr-group', 'TrGroup'),
+  TrComponent: _.makeTemplateComponent('rt-tr', 'Tr'),
   ThComponent: ({ toggleSort, className, children, ...rest }) => {
     return (
       <div
@@ -189,8 +189,8 @@ export default {
       </div>
     )
   },
-  TdComponent: _.makeTemplateComponent('rt-td'),
-  TfootComponent: _.makeTemplateComponent('rt-tfoot'),
+  TdComponent: _.makeTemplateComponent('rt-td', 'Td'),
+  TfootComponent: _.makeTemplateComponent('rt-tfoot', 'Tfoot'),
   FilterComponent: ({ filter, onChange }) =>
     <input
       type='text'
@@ -237,7 +237,7 @@ export default {
         {loadingText}
       </div>
     </div>,
-  NoDataComponent: _.makeTemplateComponent('rt-noData'),
-  ResizerComponent: _.makeTemplateComponent('rt-resizer'),
+  NoDataComponent: _.makeTemplateComponent('rt-noData', 'NoData'),
+  ResizerComponent: _.makeTemplateComponent('rt-resizer', 'Resizer'),
   PadRowComponent: () => <span>&nbsp;</span>,
 }
diff --git a/src/utils.js b/src/utils.js
index 1bc537c..8d7a02b 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -121,11 +121,16 @@ function sum (arr) {
   }, 0)
 }
 
-function makeTemplateComponent (compClass) {
-  return ({ children, className, ...rest }) =>
+function makeTemplateComponent (compClass, displayName) {
+  if (!displayName) {
+    throw new Error('No displayName found for template component:', compClass)
+  }
+  const cmp = ({ children, className, ...rest }) =>
     <div className={classnames(compClass, className)} {...rest}>
       {children}
     </div>
+  cmp.displayName = displayName
+  return cmp
 }
 
 function groupBy (xs, key) {