CLEANUP: Improve naming convention and parameter passing of ContentService and associated stuff.