Change entity naming convention