Merge "Change rules for RS name reflection."