Fix for correct position of optional attributes lable and Rename a series of variables