Merge "Remove use_apex_name_macro"