Variables renamed following C convention