Update naming; for consistency.