-- Fixed the structure of some identifiers.