apply to psm rename and update makefile