[u] rename of classes to a better understanding