rename widget names
rename file appropriately