name retrieval fixes