Rename interfaces