white space
trap for machine names in entities not being machine format
switch to machine name for these 3
features reexported
patch from mark and flipping crazy functionality
description of how insane this is