Resolved inconsistent naming errors