Nowadays, many commercial CAD systems support history-based, constraint-based and feature-based modeling. Unfortunately, most systems fail during the re-evaluation phase when various kind of topological changes occur. This issue is known as "persistent naming" which refers to the problem of identifying entities in an initial parametric model and matching them in the re-evaluated model. Most works in this domain focus on the persistent naming of atomic entities such as vertices, edges or faces. But very few of them consider the persistent naming of aggregates like shells (any set of faces). We propose in this paper a complete framework for identifying and matching any kind of entities based on their underlying topology, and particularly shells. The identifying method is based on the invariant structure of each class of form features (a hierarchical structure of shells) and on its topological evolution (an historical structure of faces). The matching method compares the initial and the re-evaluated topological histories, and computes two measures of topological similarity between any couple of entities occurring in both models. The naming and matching method has been implemented and integrated in a prototype of commercial CAD Software (Topsolid).