Rename interface to class