fixing widget and namings