rename and rearchitecture