Update face names and doc strings for clarity.