Corrected classes names and made changes to the methods in some of the
interfaces.