Reorganize code.
More renames.