Made some renames.