rename some badly named variables