Internal naming convention consistency change.