Fixed more naming problems