fixing some nameing errors