Change descriptor names to standard.