fix naming problems