Rename variables to make it clear when we're using a source name