Classes names modified