Naming convention no longer valid for erados use cases