Removed remaining references to 'entities'