Changes to var. names