fixing case naming issues