More coherent naming of used variables