Updated Entity naming convention