code review change for swc-420, rename and move entity list