Changed interface names to be more correct.