Few renames from recent commit to show better authorship