Bug 13895: Adapt naming according to voted RFC