Issue 758 - refactored services to remove "I" prefix.