Uniformize var names