Fix factory and service generation and naming
Bump to 0.4.3