Changed Entity table names