Cleanup variable names after class rename