Renaming left-overs of management api