Improved code_name and source gen