Rename and simplify