Removed 'I' prefix from interfaces - remaining changes.