These variable names no longer match the ones from the define, not sure why they were changed?

Also, it's our style to put the `*` on the right hand side, so no space between it and `const`.