Modify naming, whitespace