Refactor name of interface for norme