Renamed interfaces to conform to java naming conventions