More renaming and added missing license headers