Removed 'I' prefix from interfaces.