mantaining names consistency