Correct minor build errors
Adjusted INST_ define names