Maintenance: naming convention -- using plural