Rename render classes (continue)