Refactor to remove "UTM" from some class names.