Fixed more naming issues