[Matahari] [PATCH] Services: Raise events using the correct API source