fixed entity naming