Renamed ID's to enable icons for auto completions