Refactors and fixes template finder implementation

- finder was incorrectly marking templates as overridden

[#81525756]
Uses constants in place of magic strings for template names