changed variable names according to coding convention