Refactored content_* helper names