Minor names tunning.