Minor changes on internal variables names