small name fix
ok, just merge all entities into one...