Extensive class and argument name changes