Fixed new gap naming.