fix up class and id names