rename collection classes