Rename final release name cf-release -> cf
Rename cf-release->cf release name in aws template