Fixed typo
Changed naming a bit
Refactored ContentInterface