Fixed names of space identifiers