Clean up and naming change.