fix c&p name issues