Update and rename htc-chacha-icong.xml to htc-chacha.xml