Bundle and entities names should be singular