Add access field (#934)
Rename variable
Split locales into individual files

This avoids a fragile regexp for the en special case.