Rename vars names