More var name and structure changes