Updated the interfaces and renamed some methods.