Rename, db dispose fix.