changed Interface names to *Interface, classes given unmodified name