line breaks and naming change