Collection marks technically have multiple names in the code
At least filename, name and name plural.

Make sure these are consistent and don't break if the filename differs from the name value, or any other combination.