Fix names for data.
Minor refactoring.