Adjust renamed Class