Not really a functionality change, but weve got several suffixes with similar meanings lying around the code base.
EntityType
ShapeContext
BodyTemplate
Where applicable all of these should be updated to match. The best candidate, in my opinion, is "Template"