Fix name cleaner for rs.