Fixed upstream-name and source fields