Fixing more merge issues
Rename the sms mocker template cause UNIX