change var names to be consistent