parse-datetime: do some more renaming