Repair heat templates

After moving 'Services' folder some files were empty
Refactor variable name in api

Change-Id: Iaefbd953641a1e4e0e25ab36f7f3866e15469250