Added final bits of renaming to include Upgradr