Use EMAMOpt2CPP instead of EMAM2CPP
This will create a new commit in order to revert the existing changes.