Changes to allow custom repo names