Changed class and id names