Changes in terms of naming consistency.