Replace elcom by ELCOM in some cases