Update widget id variable names