Somehow some mnemonics got erased in !315 (merged) Re-introducing them.
assigned to @mercadil
mentioned in commit efea5f26
merged