entity_check -> check variable name cleanup (WIP)