update names
fix new line