Adjusted to interface renaming