preserve custom entity names