Rename classes as discussed