Changed the value names