Use short name for entities URIs, if available. Closes #31