How to group resources into a resource bundle?

What is the best approach for grouping resources in a resource package file? I consider the most common grouping of resources by a web page, for example:

# -- company page 
company.name.lbl=Name: 
company.address.lbl=Address:

# -- contact page 
contact.name.lbl=Name: 
contact.email.lbl=Email: 

The problem is that many fields with the same name are duplicated. Could you recommend identifying all common names and grouping them separately? Sort of:

name.lbl=Name: 
address.lbl=Address: 
email.lbl=Email: 

Of course, this also has some drawbacks, if you want to change the company name label to "Company name", then you can change the label of the contact name without a value. Of course, you must create a new resource for this, but it is possible that the person who made the changes may not notice the creation of a new resource.