Using more descriptive name
Removed unused component from being injected
Covered core feeds with templates