Short name cleanup