[#6] Variables renamed