Refactor for property name generate