Reorg, add working name model