fixed renamed entities