Renaming & whitespace changes