Changed entities name in specs