make function names more clear
correct the ifdef