Rename interfaces per discussion.