Added types to name in factory, service, const, value