renamed vardefs and layoutdefs