update variable names to comply with ruby naming conventions