Backport a few small changes to template plugins from 2.0
Corrected entity class names.