Added handling of names with underscores.