Merge "Getting rid of the (hidden) oldName parameter for widgets"