corrected naming issues