Changed the name to something that made sense, maybe leave room for future upgradeability