change name of classes to avoid error