Minor changes on internal variable names