Change unprefixed_name to normalized_name.