rename and leave typeof as is when needed.