Resolve 'time' name conflicts