Changed clases variables names.