Merge "Rename apex keys to match with APEX bundle name"