Tweak start/end variable names to match Google API