Cleanup variable names that had bodybody