Try to fix
unbreak, rename variables