Clean up a few incorrect attribute names