Refactor so names include Upgradr