[2.2.1] Apply reviewed header file (Base to Collection)