- Fixed endless code generation loop
- Fixed wrong import names (name convention must be satisfied!!!)