Cleanup of some names and path for widget2 related code