Rename, fix linux build