Fixed naming problems