Naming errors corrected