Rename class so it corresponds with filename and remove 'head' field