Renaming ChallengeCatogory to ChallengeArea

Change-Id: I6d8ad1256da486259d7f3dbd32d69c53e69ee65f