renamed variables, classes, methods for compliance;