rename and refactored code generation close #55