Updated short names