Changed some names for consistency.