Merge "Adjust map names due to new bpfloader"