Fix makefile substitution references and updates references for the correct power supplier in cmd files