Renamed math.h to avoid a conflict with std math
Minor fix on collision set