Fixing overflow of external identifiers name