Changed value names