Rename interfaces to be in line with coding standards