Removed entity naming.