Renaming clientId to appId
Merging