Fix #1732 and #1735 - uses 'ec gui. and ai.' prefixes