#22572 - Updated to better handle not having name in the templates