Added $exceptionHandler, fixed $names in Services and Factories