Changed variables' name to match with the naming practice of the rest of the code