Fix some shit that renaming some shit broke.