Part of rename and parameter work