Use shorter identifiers