Fix class & table name