Fix invalid repository name
Some renaming of bad variable names and move the backoff strategy to a more fitting location in the namespace