Changed content area naming conventions.