naming problems fix