Missed the actual ifdef/define renames.