Finish renaming helper classes