Updates classes to repsect new Nealtline naming conventions.