Renaming classes as per http://make.wordpress.org/core/handbook/coding-standards/php/#naming-conventions