Updates clases to respect new Neatline naming convention.