Minor renames.
Merged with VOTable changes. Minor renames.