[Generators - Improvments]
	- Improves the code
	- Fixes some bugs related to naming conventions