replacing getName calls by getShortName (getName methods were removed in 4.3.16)