Fixed naming problems.